Removed a temporary MSVC workaround.