Back out bug 1057904, bug 1060869, bug 923302 for bustage

--HG--
extra : rebase_source : fe24318671f3fd9cccb822c65a9581f09612d8c6