Backout bug 924702 for test failures.