Merge "Revert work around clang-tidy segmentation fault."