Back out Bug 887533 for test failures.