Revert "Fixes for warnings when building with MSVC"

This reverts commit 46eb20b98ce990756ad1f9af5054f0a571dca43c.