diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 290d1a7..88b8d8f 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -2100,13 +2100,11 @@ public function renderMoreLink() {
           $url_options['query'] = $this->view->exposed_raw_input;
         }
         $url->setOptions($url_options);
-        $theme = $this->view->buildThemeFunctions('views_more');
 
         return array(
-          '#theme' => $theme,
-          '#more_url' => $url->toString(),
-          '#link_text' => SafeMarkup::checkPlain($this->useMoreText()),
-          '#view' => $this->view,
+          '#type' => 'more_link',
+          '#url' => $url,
+          '#title' => $this->useMoreText(),
         );
       }
     }
diff --git a/core/modules/views/templates/views-more.html.twig b/core/modules/views/templates/views-more.html.twig
deleted file mode 100644
index b161a65..0000000
--- a/core/modules/views/templates/views-more.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a views "more" link.
- *
- * Available variables:
- * - view: The view object.
- * - more_url: The URL for the views "more" link.
- * - link_text: The text for the views "more" link.
- *
- * @ingroup themeable
- */
-#}
-<a href="{{ more_url }}" class="more-link">{{ link_text }}</a>
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 25c62f8..8e8db62 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -209,10 +209,6 @@ function views_theme($existing, $type, $theme, $path) {
     'render element' => 'form',
   );
 
-  $hooks['views_more'] = $base + array(
-    'variables' => array('more_url' => NULL, 'link_text' => 'more', 'view' => NULL),
-  );
-
   return $hooks;
 }