backout 01a00ce2b662 (Bug 940381) since its mochitest tweaks may make things less robust instead of more robust