Backed out changeset b07bd3a55770 (bug 990628) since it needs to land on b2g-inbound alongside a moztt PR

--HG--
extra : rebase_source : 9fef0224bc628d4eced8b4bef92713bf82cc0796