Revert "Possible fix for Windows test failures."

This reverts commit ec7db86ef74d6214cecbb00e4d049161ffcbb169.