_WIN32 specific changes
Revert "_WIN32 specific changes"

This reverts commit 229a36a76ab6952c8e3e45bcdf009581c9ba893b.