Revert "Blind fix attempt for MSVC compilation error"

Nah. As sberg says on IRC, "I'm glad MSVC is not /that/ broken that
c2161066746ca5767a8ff9a7759729940788d917 would have fixed it"

This reverts commit c2161066746ca5767a8ff9a7759729940788d917.