Reverting r197715 -- it appears that MSVC is happy with the code, but clang is not.