Reverts commit r190808 and r190556.

The use of these features in clang has been reverted.