Back out bug 1050122 for causing silent timeouts on emulator mochitests. a=me
Merge m-c to b2g-inbound.