Revert r244516; it was causing cmake configuration failures on Windows with Visual...