Revert "Add workaround to build scoped enums with VS2015. NFCI."

This reverts commit 6080a6fb (r356532).

Clang does not accept this syntax, so reverting this until I can find something that works across all compilers.

llvm-svn: 356533