This reverts commit 51a60ed1, since the test still doesn't pass on Windows. Marking the test as UNSUPORTED on Windows again until I've figured out the problem.