[#1922] Removed icd as a special case