Revert "This reapplies r207130 with an additional testcase+and a missing check for"

This reverts commit 207235 to investigate msan buildbot breakage.
SCC: Doxygen-ize comments, NFC

<rdar://problem/14292693>