This reverts commit 93c8e48cd4. Was hoping this would fix the protobuf build issues on win32; it did not.
93c8e48cd4