Backed out changeset 1b9e9be1db29 (bug 1030277) for intermittent test failures