backout 646c20d6d346 (Bug 1007027) for jit test failures