Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php	(revision 31267)
+++ wp-includes/category-template.php	(working copy)
@@ -1305,7 +1305,7 @@
 
 	$terms = get_object_term_cache( $post->ID, $taxonomy );
 	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post->ID, $taxonomy );
+		$terms = wp_get_object_terms( $post->ID, $taxonomy, array('fields' => 'all_with_object_id') );
 		wp_cache_add($post->ID, $terms, $taxonomy . '_relationships');
 	}
 
Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 31267)
+++ wp-includes/taxonomy.php	(working copy)
@@ -3783,7 +3783,7 @@
 
 	$object_terms = array();
 	foreach ( (array) $terms as $term )
-		$object_terms[$term->object_id][$term->taxonomy][$term->term_id] = $term;
+		$object_terms[$term->object_id][$term->taxonomy][] = $term;
 
 	foreach ( $ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {