Backed out changesets 45f20f94da76 and 47c4a7768ed9 (bug 841436) for Windows bustage on a CLOSED TREE.