Backout f3b6bc4b2590 (Bug 827749) for test failures.