Backout bug 1043171 for test failures