Backed out changeset d1f3c8d40cdf (bug 1116355) for breaking w-4 tests on a CLOSED TREE