Merge "Revert workaround of clang-tidy segmentation fault."