This breaks a clang-tidy check, needs to investigate and fix. Revert them to bring the buildbot back. This reverts commit 55d96ac3 and 37ec65e1