Backed out changeset f24d81b85929 (bug 895182) for Windows build failures on a CLOSED TREE