Revert "Fixed compiler warnings on MSVC 12."

This reverts commit ff5743e113acfb20cc6c15e7e5c7e7c57d17ff85.