diff --git a/core/includes/form.inc b/core/includes/form.inc
index dd171e7..7563f1f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -4072,8 +4072,7 @@ function theme_vertical_tabs($variables) {
 }
 
 /**
- * Adds autocomplete functionality to elements with a valid
- * #autocomplete_route_name.
+ * Adds autocomplete functionality to elements with a valid #autocomplete_route_name.
  *
  * Suppose your autocomplete route is 'mymodule.autocomplete.'
  * In your form you have:
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 84e3a4f..52b2043 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -326,6 +326,7 @@ function system_element_info() {
     '#size' => 60,
     '#maxlength' => 128,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_autocomplete', 'ajax_process_form', 'form_process_pattern'),
     '#pre_render' => array('form_pre_render_textfield'),
     '#theme' => 'input__textfield',
@@ -336,6 +337,7 @@ function system_element_info() {
     '#size' => 30,
     '#maxlength' => 128,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_autocomplete', 'ajax_process_form', 'form_process_pattern'),
     '#pre_render' => array('form_pre_render_tel'),
     '#theme' => 'input__tel',
@@ -347,6 +349,7 @@ function system_element_info() {
     // user.module is not loaded in case of early bootstrap errors.
     '#maxlength' => defined('EMAIL_MAX_LENGTH') ? EMAIL_MAX_LENGTH : 255,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_autocomplete', 'ajax_process_form', 'form_process_pattern'),
     '#element_validate' => array('form_validate_email'),
     '#pre_render' => array('form_pre_render_email'),
@@ -358,6 +361,7 @@ function system_element_info() {
     '#size' => 60,
     '#maxlength' => 255,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_autocomplete', 'ajax_process_form', 'form_process_pattern'),
     '#element_validate' => array('form_validate_url'),
     '#pre_render' => array('form_pre_render_url'),
@@ -369,6 +373,7 @@ function system_element_info() {
     '#size' => 60,
     '#maxlength' => 128,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_autocomplete', 'ajax_process_form'),
     '#pre_render' => array('form_pre_render_search'),
     '#theme' => 'input__search',
@@ -409,6 +414,7 @@ function system_element_info() {
     '#maxlength' => 64,
     '#size' => 60,
     '#autocomplete_route_name' => FALSE,
+    '#autocomplete_route_parameters' => FALSE,
     '#process' => array('form_process_machine_name', 'form_process_autocomplete', 'ajax_process_form'),
     '#element_validate' => array('form_validate_machine_name'),
     '#pre_render' => array('form_pre_render_textfield'),