Backed out changeset da0bf52f00c6 (bug 1042795) for introducing new intermittent failures.