Backout e3a2d93fb173 for test failures.