Backed out changeset e01dbdf8a218 (bug 1016613) for causing bug 1034607

--HG--
extra : transplant_source : %D4%F9qhE%3A%91%92-B%DD%17%7D%B6%CAc%1C%D2%28%B0