Backout bea3f06585ec (Bug 969012) for arm simulator failures.