--- libnautilus-private/nautilus-canvas-item.c	2013-11-04 18:37:40.285846969 +0100
+++ libnautilus-private/nautilus-canvas-item.c	2013-11-04 18:42:32.911892562 +0100
@@ -814,20 +814,9 @@
 
 	needs_highlight = details->is_highlighted_for_selection || details->is_highlighted_for_drop;
 
-	if (needs_highlight ||
-	    details->is_prelit ||
-	    details->is_highlighted_as_keyboard_focus ||
-	    details->entire_text) {
-		/* VOODOO-TODO, cf. compute_text_rectangle() */
-		pango_layout_set_height (layout, G_MININT);
-	} else {
-		/* TODO? we might save some resources, when the re-layout is not neccessary in case
-		 * the layout height already fits into max. layout lines. But pango should figure this
-		 * out itself (which it doesn't ATM).
+		/* we don't want to overlap with icons below
 		 */
-		pango_layout_set_height (layout,
-					 nautilus_canvas_container_get_max_layout_lines_for_pango (container));
-	}
+	pango_layout_set_height (layout, nautilus_canvas_container_get_max_layout_lines_for_pango (container));
 }
 
 static void
