Backed out changeset c2e0f245d909 (bug 1020041) for test failures.