Revert rL220675 due to failures on check-clang