Revert "Builds okay with prebuilt clang."

This reverts commit 55a06aad10d0c98e34f7b64b9e3fa1ce0a590e9f.