Backed out changesets 027c65d3ac10 and 541ea8e2706e (bug 1104623) for intermittent leaks in the new test.