This reverts commit 9905c379. Looks like there are Clang changes that are affected in trivial ways. Will look into it.