Backed out changeset 9b2114c04762 (bug 885349) for timeouts in the new test.