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