Backed out changesets 013c6a8663ab and 5f8dea9b01ac (bug 1045739) for B2G bustage.

--HG--
extra : rebase_source : 750fca3c8d3b035a59639bc4e8a273ea3f6bf02c