Backed out changeset f6395f17c99f (bug 960897) for intermittent test failures