Backed out changeset 19719fd38363 (bug 1039484) for intermittent test failures