backout of
https://hg.mozilla.org/integration/mozilla-inbound/rev/93501fc853ed
Bug 885784; not intended to push, old bug

--HG--
extra : rebase_source : 3ff8955be64870195163d1368ff136619f0e8c93
extra : amend_source : 6e734c23067299d711bb5d477cc3e5bca369aaae