Backed out changeset a4d9432cdd70 (bug 1030435) for re-introducing intermittent failures.