diff --git a/core/modules/system/lib/Drupal/system/Access/SystemPluginUiCheck.php b/core/modules/system/lib/Drupal/system/Access/SystemPluginUiCheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..db13644f96177bbfa50a0efd1af65e19e4cdc550
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Access/SystemPluginUiCheck.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Access\SystemPluginUiCheck.
+ */
+
+namespace Drupal\system\Access;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Access\AccessCheckInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Access check for system routes.
+ */
+class SystemPluginUiCheck implements AccessCheckInterface {
+
+  /**
+   * The plugin UI manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $pluginUiManager;
+
+  /**
+   * Constructs a SystemController object.
+   *
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $plugin_ui_manager
+   *   The plugin UI manager.
+   */
+  public function __construct(PluginManagerInterface $plugin_ui_manager) {
+    $this->pluginUiManager = $plugin_ui_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_access_system_plugin_ui', $route->getRequirements());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access(Route $route, Request $request) {
+    if ($request->attributes->get('plugin_id')) {
+      // Checks access for a given plugin using the plugin's access() method.
+      $plugin_ui = $this->pluginUiManager->createInstance($request->attributes->get('plugin_id'), array());
+      return $plugin_ui->access(NULL) ? static::ALLOW : static::DENY;
+    }
+  }
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
new file mode 100644
index 0000000000000000000000000000000000000000..bd71353d88b89c01bc67aa9764e18c7abc5486e0
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Controller\SystemController.
+ */
+
+namespace Drupal\system\Controller;
+
+use Drupal\Component\Utility\Tags;
+use Drupal\Component\Utility\Unicode;
+use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+
+/**
+ * Returns responses for System routes.
+ */
+class SystemController extends ContainerAware {
+
+  /**
+   * Autocompletes any plugin system tied to a plugin UI plugin.
+   *
+   * The passed plugin_id indicates the specific plugin_ui plugin that is in use
+   * here. The documentation within the annotation of that plugin will contain a
+   * manager for the plugins that need to be autocompleted allowing this
+   * function to autocomplete plugins for any plugin type.
+   *
+   * @param string $plugin_id
+   *   The plugin id for the calling plugin.
+   * @param Request $request
+   *   The request object that contains the typed tags.
+   *
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
+   *   The matched plugins as json.
+   */
+  public function autocomplete($plugin_id, Request $request) {
+    $string_typed = $request->query->get('q');
+    $string_typed = Tags::explode($string_typed);
+    $string = Unicode::strtolower(array_pop($string_typed));
+    $matches = array();
+    if ($string) {
+      $plugin_ui = $this->container->get('plugin.manager.system.plugin_ui')->getDefinition($plugin_id);
+      $manager = $this->container->get($plugin_ui['manager']);
+      $titles = array();
+      foreach($manager->getDefinitions() as $plugin_id => $plugin) {
+        $titles[$plugin_id] = $plugin[$plugin_ui['title_attribute']];
+      }
+      $matches = preg_grep("/\b". $string . "/i", $titles);
+    }
+
+    return new JsonResponse($matches);
+  }
+
+}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index ac42ea3a19cba7286f4576c3dfedb712ef63fbc5..d276203ee619b9ce00c69bde48e011b08cd7bfbb 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1012,13 +1012,6 @@ function system_menu() {
           $items[$plugin['path'] . '/' . $plugin_id . '/%']['file path'] = $plugin['file_path'];
         }
       }
-      $items['system/autocomplete/' . $plugin_id] = array(
-        'page callback' => 'system_plugin_autocomplete',
-        'page arguments' => array($plugin_id),
-        'access callback' => 'system_plugin_ui_access',
-        'access arguments' => array($plugin_id),
-        'type' => MENU_CALLBACK,
-      );
     }
   }
 
@@ -1039,37 +1032,6 @@ function system_plugin_ui_form($form, &$form_state, $plugin, $facet = NULL) {
   return $form;
 }
 
-/**
- * Page callback: Autocompletes any plugin system tied to a plugin UI plugin.
- *
- * The passed plugin_id indicates the specific plugin_ui plugin that is in use
- * here. The documentation within the annotation of that plugin will contain a
- * manager for the plugins that need to be autocompleted allowing this function
- * to autocomplete plugins for any plugin type.
- *
- * @param $plugin_id
- *   The plugin id for the calling plugin.
- *
- * @return object JsonResponse
- */
-function system_plugin_autocomplete($plugin_id) {
-  $string_typed = drupal_container()->get('request')->query->get('q');
-  $string_typed = drupal_explode_tags($string_typed);
-  $string = drupal_strtolower(array_pop($string_typed));
-  $matches = array();
-  if ($string) {
-    $plugin_ui = Drupal::service('plugin.manager.system.plugin_ui')->getDefinition($plugin_id);
-    $manager = Drupal::service($plugin_ui['manager']);
-    $titles = array();
-    foreach($manager->getDefinitions() as $plugin_id => $plugin) {
-      $titles[$plugin_id] = $plugin[$plugin_ui['title_attribute']];
-    }
-    $matches = preg_grep("/\b". $string . "/i", $titles);
-  }
-
-  return new JsonResponse($matches);
-}
-
 /**
  * Checks access for a given plugin using the plugin's access() method.
  *
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 301ab6d40a4eda933a692e1c1398ffa00f137b69..144c8f94bff986956692cdca2acef71b1402a073 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -171,3 +171,10 @@ system_timezone:
     _controller: '\Drupal\system\Controller\TimezoneController::getTimezone'
   requirements:
     _access: 'TRUE'
+
+system_plugin_autocomplete:
+  pattern: '/system/autocomplete/{plugin_id}'
+  defaults:
+    _controller: 'Drupal\system\Controller\SystemController::autocomplete'
+  requirements:
+    _access_system_plugin_ui: 'TRUE'
diff --git a/core/modules/system/system.services.yml b/core/modules/system/system.services.yml
index 6aefa00dd350657d9ba0151c93c5b27f64db88b3..3b9eac7cb8ebf2f2fe65a3cdc831ab6a98dc5fe7 100644
--- a/core/modules/system/system.services.yml
+++ b/core/modules/system/system.services.yml
@@ -3,6 +3,11 @@ services:
     class: Drupal\system\Access\CronAccessCheck
     tags:
       - { name: access_check }
+  access_check.system_plugin_ui:
+    class: Drupal\system\Access\SystemPluginUiCheck
+    tags:
+      - { name: access_check }
+    arguments: ['@plugin.manager.system.plugin_ui']
   plugin.manager.system.plugin_ui:
     class: Drupal\system\Plugin\Type\PluginUIManager
     arguments: ['@container.namespaces']