back out bug 894493 for test failure