This reverts commit 146bd125,
Clang's r224465 does not look really useful the way it is, so work around
that directly in Clang for now.