Undid a MSVC warning fix that caused issues with other compilers.