Bug 891660. Backout the part of c59328e3cabf that broke mochitest 4

--HG--
extra : rebase_source : fa7b76b37f575742342b4914a1859bf3820f8593