Backed out changesets 64bad42e13b7 and 1e2fc9c3b3c5 (bug 836208) for Windows test failures on a CLOSED TREE.