Backed out changeset e2ac4f906a29 (bug 843019) for intermittent test failures.