diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index e9346d8..2d0bdf1 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1701,9 +1701,8 @@ function drupal_pre_render_links_real($elements) {
       $elements['#items'][$key] = &$elements[$key]['#children'];
     }
   }
-  // 'type' is most probably the most stupid theme variable ever.
-  // @todo Fix theme_item_list() to use 'tag' instead of 'type'.
-  $elements['#type'] = $elements['#tag'];
+  // @todo Remove this when https://drupal.org/node/1828536 is committed.
+  $elements['#type'] = $elements['#list_type'];
 
   return $elements;
 }
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 5b6f1ea..0b3a042 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -549,7 +549,7 @@ function system_element_info() {
     '#pre_render' => array('drupal_pre_render_links_real'),
     // Using a key to allow for easy access to add a theme sub-pattern.
     '#theme_wrappers' => array('links' => 'item_list'),
-    '#tag' => 'ul',
+    '#list_type' => 'ul',
     '#attributes' => array('class' => array('links', 'inline')),
   );
   $types['link'] = array(