Try different fix for mochitests. DONTBUILD
Backout 797d19721fee. DONTBUILD