If 1.6 broke your build and you wish to rollback to 1.5 (temporarily), this worked for me:

  git clone https://github.com/phonegap/phonegap.git
  git checkout -b de1960d5a3 de1960d5a3