Backed out changeset d525f195556d (bug 997886) for intermittent test failures.