@@ -864,7 +864,7 @@ function creativecommons_get_licenses($o
       $license_key = $value_as_type ? $license_type : $license_uri;
       $license_name = $value_as_type ? creativecommons_generic_license_name($key['value']) : $key['value'];
 
-      $license_class = $license_type == 'publicdomain' ? t('Public Domain') : t('Creative Commons');
+      $license_class = $license_type == 'mark' || $license_type == 'zero' ? t('Public Domain') : t('Creative Commons');
       $licenses[$license_class][$license_key] = $license_name;
     }
   }
@@ -872,16 +872,6 @@ function creativecommons_get_licenses($o
   // Sort licenses by freedom
   uksort($licenses[t('Creative Commons')], 'creativecommons_license_sort');
 
-  // CC0
-  $zero = new creativecommons_license('http://creativecommons.org/publicdomain/zero/1.0/');
-
-  if ($value_as_type) {
-    $licenses[t('Public Domain')][$zero->type] = creativecommons_generic_license_name($zero->get_name());
-  }
-  else {
-    $licenses[t('Public Domain')][$zero->uri] = $zero->get_name();
-  }
-
   return $licenses;
 }