Backed out changeset b17854552298 (bug 1042252) for intermittent test failures