Backout 8e3b6d7159c2, bug 929274, for test failures.