diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 52ce316..26411db 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -763,7 +763,6 @@ function drupal_find_theme_templates($cache, $extension, $path) {
     $hook = strtr($template, '-', '_');
     if (isset($cache[$hook])) {
       $implementations[$hook] = array(
-        'template' => $template,
         'path' => dirname($file->uri),
       );
     }
@@ -2594,31 +2593,24 @@ function drupal_common_theme() {
     // From theme.inc.
     'html' => array(
       'variables' => array('page_object' => NULL),
-      'template' => 'html',
     ),
     'page' => array(
       'render element' => 'page',
-      'template' => 'page',
     ),
     'region' => array(
       'render element' => 'elements',
-      'template' => 'region',
     ),
     'datetime' => array(
       'variables' => array('timestamp' => NULL, 'text' => NULL, 'attributes' => array(), 'html' => FALSE),
-      'template' => 'datetime',
     ),
     'status_messages' => array(
       'variables' => array('display' => NULL),
-      'template' => 'status-messages',
     ),
     'links' => array(
       'variables' => array('links' => array(), 'attributes' => array('class' => array('links')), 'heading' => array(), 'set_active_class' => FALSE),
-      'template' => 'links',
     ),
     'dropbutton_wrapper' => array(
       'variables' => array('children' => NULL),
-      'template' => 'dropbutton-wrapper',
     ),
     'image' => array(
       // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft
@@ -2634,36 +2626,30 @@ function drupal_common_theme() {
       // The title attribute is optional in all cases, so it is omitted by
       // default.
       'variables' => array('uri' => NULL, 'width' => NULL, 'height' => NULL, 'alt' => '', 'title' => NULL, 'attributes' => array()),
-      'template' => 'image',
     ),
     'breadcrumb' => array(
       'variables' => array('breadcrumb' => NULL),
-      'template' => 'breadcrumb',
     ),
     'table' => array(
       'variables' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''),
     ),
     'tablesort_indicator' => array(
       'variables' => array('style' => NULL),
-      'template' => 'tablesort-indicator',
     ),
     'mark' => array(
       'variables' => array('status' => MARK_NEW),
     ),
     'item_list' => array(
       'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array(), 'empty' => NULL),
-      'template' => 'item-list',
     ),
     'feed_icon' => array(
       'variables' => array('url' => NULL, 'title' => NULL),
-      'template' => 'feed-icon',
     ),
     'more_link' => array(
       'variables' => array('url' => NULL, 'title' => NULL)
     ),
     'progress_bar' => array(
       'variables' => array('label' => NULL, 'percent' => NULL, 'message' => NULL),
-      'template' => 'progress-bar',
     ),
     'indentation' => array(
       'variables' => array('size' => 1),
@@ -2671,11 +2657,9 @@ function drupal_common_theme() {
     // From theme.maintenance.inc.
     'maintenance_page' => array(
       'variables' => array('content' => NULL, 'show_messages' => TRUE, 'page' => array()),
-      'template' => 'maintenance-page',
     ),
     'install_page' => array(
       'variables' => array('content' => NULL, 'show_messages' => TRUE, 'page' => array()),
-      'template' => 'install-page',
     ),
     'task_list' => array(
       'variables' => array('items' => NULL, 'active' => NULL,  'variant' => NULL),
@@ -2689,7 +2673,6 @@ function drupal_common_theme() {
     // From pager.inc.
     'pager' => array(
       'variables' => array('tags' => array(), 'element' => 0, 'parameters' => array(), 'quantity' => 9),
-      'template' => 'pager',
     ),
     // From menu.inc.
     'menu_link' => array(
@@ -2713,19 +2696,15 @@ function drupal_common_theme() {
     ),
     'select' => array(
       'render element' => 'element',
-      'template' => 'select',
     ),
     'fieldset' => array(
       'render element' => 'element',
-      'template' => 'fieldset',
     ),
     'details' => array(
       'render element' => 'element',
-      'template' => 'details',
     ),
     'radios' => array(
       'render element' => 'element',
-      'template' => 'radios',
     ),
     'date' => array(
       'render element' => 'element',
@@ -2735,18 +2714,15 @@ function drupal_common_theme() {
     ),
     'form' => array(
       'render element' => 'element',
-      'template' => 'form',
     ),
     'textarea' => array(
       'render element' => 'element',
-      'template' => 'textarea',
     ),
     'tableselect' => array(
       'render element' => 'element',
     ),
     'form_element' => array(
       'render element' => 'element',
-      'template' => 'form-element',
     ),
     'form_required_marker' => array(
       'render element' => 'element',
@@ -2756,20 +2732,16 @@ function drupal_common_theme() {
     ),
     'vertical_tabs' => array(
       'render element' => 'element',
-      'template' => 'vertical-tabs',
     ),
     'container' => array(
       'render element' => 'element',
-      'template' => 'container',
     ),
     // From field system.
     'field' => array(
       'render element' => 'element',
-      'template' => 'field',
     ),
     'field_multiple_value_form' => array(
       'render element' => 'element',
-      'template' => 'field-multiple-value-form',
     ),
   );
 }