Backout bug 862275 for test failures