Revert fa1f52704c9e. r=bustage.

--HG--
extra : rebase_source : 0902425782990758102c17fbfb6918b36aba39af