Backed out changeset 7b0ae11d2441 (bug 1057512) for introducing various new intermittent failures and making an existing one perma-fail.