diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index a6442751f..f14f6330a 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -9,16 +9,10 @@
 /** 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( $taxonomy );
+$tax = get_taxonomy( $taxnow );
 
 if ( ! $tax )
 	wp_die( __( 'Invalid taxonomy' ) );