Backing out b5d49f1885af as it wasn't properly backed out in 0611006cc095

--HG--
extra : rebase_source : 22687deeeee7abd76e424b21bec8fc59fb6f7515