Backout bug 881997 for conformance test failures