Backed out changeset 047f98eef5cf (bug 1007196) for intermittent failures.