Backed out changeset c677f867a18a (bug 1101287) for making the test more failure-prone that it was before. CLOSED TREE