Revert "Fix for windows build"

This reverts commit d40db965d3e3aaa02375d2fa19bb480c2a464160.