Revert "Another try at making MSVC happy again."

Prospective revert to see if r208512 helped the MSVC build.

This reverts commit r208497.