Back out bug 1019248 due to test failures.