Revert "Partial fix for windows test fails"

This reverts commit 1f430732373d2233b0a6579c3fcf9081a62436b6.

Unrevert commit, it belonged in a branch.