Index: wp-admin/includes/taxonomy.php
===================================================================
--- wp-admin/includes/taxonomy.php	(revision 18977)
+++ 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 18977)
+++ wp-admin/includes/template.php	(working copy)
@@ -265,10 +265,13 @@
 	foreach ( $taxonomy_names as $taxonomy_name) {
 		$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>';
-		elseif ( $taxonomy->show_ui )
+		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
+			$terms = get_the_terms( $post->ID, $taxonomy_name );
+			$term_ids = !empty( $terms ) ? wp_list_pluck( $terms, 'term_id' ) : array();
+			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>';
+		}
 	}
 
 	if ( !$post_type_object->hierarchical )