diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 6c74991e6a..b984c6862f 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -104,7 +104,7 @@ function get_nested_categories( $default = 0, $parent = 0 ) {
 	if ( is_array( $cats ) ) {
 		foreach ( $cats as $cat) {
 			// TODO fix hierarchy
-			//$result[$cat]['children'] = get_nested_categories( $default, $cat);
+			$result[$cat]['children'] = get_nested_categories( $default, $cat);
 			$result[$cat]['cat_ID'] = $cat;
 			$result[$cat]['checked'] = in_array( $cat, $checked_categories );
 			$result[$cat]['cat_name'] = get_the_category_by_ID( $cat);
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 5c776f273f..50a654fbff 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -700,10 +700,10 @@ function _get_term_hierarchy($taxonomy) {
 		return $children;
 
 	$children = array();
-	$terms = get_terms($taxonomy, 'hide_empty=0&hierarchical=0');
+	$terms = get_terms($taxonomy, 'get=all');
 	foreach ( $terms as $term ) {
 		if ( $term->parent > 0 )
-			$children[$cterm->parent][] = $term->term_id;
+			$children[$term->parent][] = $term->term_id;
 	}
 	update_option("{$taxonomy}_children", $children);