Maybe we should add a tool to the SupportToolKit to check for such usages, so the admin can fix them manually