revert 70ab35f0141f6e64fa00e173ebd099697e80c0f2, wrongly committed.
Merge branch 'master' of github.com:mozilla-b2g/gaia