Revert r240137 (Fixed/added namespace ending comments using clang-tidy. NFC)