Revert my CMake patches concerning building with /MT (r194589, r194596)