Index: wp-admin/edit-tags.php
===================================================================
--- wp-admin/edit-tags.php	(revision 19126)
+++ wp-admin/edit-tags.php	(working copy)
@@ -9,17 +9,11 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( ! isset( $_GET['taxonomy'] ) )
-	$taxonomy = 'post_tag';
-elseif ( in_array( $_GET['taxonomy'], get_taxonomies() ) )
-	$taxonomy = sanitize_key( $_GET['taxonomy'] );
-else
+if ( ! $taxnow )
 	wp_die( __( 'Invalid taxonomy' ) );
 
-$_GET['taxonomy'] = $taxonomy;
+$tax = get_taxonomy( $taxnow );
 
-$tax = get_taxonomy( $taxonomy );
-
 if ( ! $tax )
 	wp_die( __( 'Invalid taxonomy' ) );