Backed out changeset d346871db5f6 (bug 1020697) for intermittent test failures