Backed out changeset 3373cd35d4c7 (bug 1020041) for test failures.