Revert changes for using cwrap with native mingw compiler