Backed out changeset ad5e5e0f18ea (bug 1026561) for intermittent test failures