revert r311839 (ongoing cwg discussion)

apologies.

llvm-svn: 311975
2 files changed