CAL-200 revert workaround for empty comment