Revert "Fix the win64 build."

This reverts commit 2975c3c9b5f8e741702591824107b07e6510ae0a.

Revert this as it seems to break the windows build.