Revert part of "fix some msvc compile errors"

This reverts commit afd739a395bf3961a9235965137b601a35d8c62c.