Backed out 49cccc8fa53c for test failures