Backed out 040e85d18eab (bug 931687) for causing bug 1018402

--HG--
extra : rebase_source : c41a6125fabb2b11fb546a3253979003d80095eb