Revert r247216: "Fix Clang-tidy misc-use-override warnings, other minor fixes"