Switch back and use newer Clang