Backed out changeset 6a613a7288e1 (bug 931399) for breaking the build on at least Windows on a CLOSED TREE