Index: wp-admin/includes/taxonomy.php
===================================================================
--- wp-admin/includes/taxonomy.php	(revision 25222)
+++ wp-admin/includes/taxonomy.php	(working copy)
@@ -219,7 +219,7 @@
 	if ( !$post_id )
 		return false;
 
-	$tags = wp_get_post_terms($post_id, $taxonomy, array());
+	$tags = get_the_terms( $post_id, $taxonomy );
 
 	if ( !$tags )
 		return false;
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 25222)
+++ wp-admin/includes/template.php	(working copy)
@@ -275,11 +275,17 @@
 		$taxonomy = get_taxonomy( $taxonomy_name );
 
 		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
-				echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">'
-					. implode( ',', wp_get_object_terms( $post->ID, $taxonomy_name, array( 'fields' => 'ids' ) ) ) . '</div>';
+
+			$terms    = get_the_terms( $post->ID, $taxonomy_name );
+			$term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
+
+			echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
+
 		} elseif ( $taxonomy->show_ui ) {
+
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
 				. esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+
 		}
 	}