c3b18b1096
This reverts commit 8b3b520675.
This was causing dllexport-related errors on win64
This reverts commit 8b3b520675.
This was causing dllexport-related errors on win64