Backed out changeset c3d41ab0a2df (bug 940218) for causing bug 941616

--HG--
extra : rebase_source : c0d9b2840ddb6a6b88b86cfc3e3a6810ac9e37e2