Partially revert "Fixes for msvc-13."

This reverts commit e69dd6740a420473a73231d997cb621072e32230.