This reverts commit 25fbe803d4dbcf8ff3a3a9ca161f5b9a68353ed0. This breaks a clang test which filters for the wrong remark type.