Revert "trying to get rid of some winsock conflicts"

This reverts commit 02d165de1f386e87eab33a192e64f37e7abd3bf9.