Bug 707564 followup.  Update to new saner JSAPI, fixing merge bustage and ridding us of this pestilential CLOSED TREE. r=bustage