Backed out changeset aa71426c4514 (bug 983490) for intermittent failures.