Revert "[clang-tidy][NFC] Remove duplicated code"

This reverts commit b6f6be4b500ff64c23a5103ac3311cb74519542f.

GitOrigin-RevId: 11a411a49b62c129bba551df4587dd446fcdc660
45 files changed