This reverts commit f289f886, which
makes the tests fail on Windows. Revert until we can figure out a
solution.