Revert "No need for win32."
I should minimize diffs against upstream, so keep win32.

This reverts commit a1ac7d5fa8638f6be9b5845b43253dfc44fc83d9.