Revert "Given up hope of compiling MSVC 2013, so I'm removing the macros."

This reverts commit b0a2568363aa5af7286e92a882c993f812192877.