diff --git a/src/control/media_list.c b/src/control/media_list.c
index f74c08328f6dd03be56508ac22c0cefa69d6a782..ccba39e4eaaa95396a47c35756e1c17108556a84 100644
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -115,26 +115,7 @@ media_descriptor_subitem_added( const libvlc_event_t * p_event, void * user_data
 
     p_new_md = p_event->u.media_descriptor_subitem_added.new_child;
 
-    /* Here we need something way clever */
-    /* We just set the  */
-    count = libvlc_media_descriptor_tags_count_for_key( p_parent_md,
-                                                        "VLCNode",
-                                                        NULL );
-    psz_parent_name = libvlc_media_descriptor_get_meta(
-                                p_parent_md, libvlc_meta_Title, NULL );
-    if( count > 0 )
-    {
-        psz_parent_tag = libvlc_media_descriptor_tag_at_index_for_key(
-                                            p_parent_md, 0, "VLCNode", NULL );
-        asprintf( &psz_tag, "%s/%s", psz_parent_tag, psz_parent_name );
-        free( psz_parent_tag );
-        free( psz_parent_name );
-    }
-    else
-        psz_tag = psz_parent_name;
-
-    libvlc_media_descriptor_add_tag( p_new_md, "VLCNode", psz_tag, NULL );
-    libvlc_media_list_add_media_descriptor( p_mlist, p_new_md, NULL );
+    /* Todo: Just forward that event to our event_manager */
 }
 
 /**************************************************************************