Backed out changeset b43ed5b85b1a (bug 1075072) because it broke other workflows.

DONTBUILD because NPOTB
Backed out changeset b8b6fa54fc1a (bug 1079231) for build failures on b2g; r=bustage

--HG--
extra : rebase_source : e7b3f492a815b53699478b08931eadae19a93501