Backed out changeset 46c1cce018de (bug 1059163) for frequent test failures of the new test