Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 20980)
+++ wp-includes/taxonomy.php	(working copy)
@@ -2263,10 +2263,7 @@
 	}
 
 	// If we didn't get a unique slug, try appending a number to make it unique.
-	if ( !empty($args['term_id']) )
-		$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $args['term_id'] );
-	else
-		$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+	$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
 
 	if ( $wpdb->get_var( $query ) ) {
 		$num = 2;