backout 91e7ba697b14 (Bug 1001309) for test failures. r=backout