Reverted changes from MSVC_Build branch