Backout changesets 37f9a5424227, c1578a4fc86d and a417424f9213 (for bugs 933354, 929021 and 923193 respectively) while we figure out performance regressions

--HG--
extra : rebase_source : e4a004a15c92b5a8a8b780e7da779ac86d1c29be