Back out 01fe5d23d233 (Bug 1063877) due to broken emulator mochitests