Backed out changeset 17220466f40b (bug 960458) for bustages on windows on a CLOSED TREE