diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyAutocompleteController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyAutocompleteController.php
index 58e14fe..21e5e99 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyAutocompleteController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyAutocompleteController.php
@@ -17,17 +17,19 @@
 class TaxonomyAutocompleteController {
 
   /**
-   * The current request.
+   * The taxonomy autocomplete helper.
    *
-   * @var \Symfony\Component\HttpFoundation\Request
+   * @var \Drupal\taxonomy\TaxonomyAutocomplete
    */
-  protected $request;
+  protected $taxonomyAutocomplete;
 
   /**
    * Constructs a TaxonomyAutocompleteController object.
+   *
+   * @param \Drupal\taxonomy\TaxonomyAutocomplete $taxonomy_autocomplete
+   *   The taxonomy autocomplete helper.
    */
-  public function __construct(Request $request, TaxonomyAutocomplete $taxonomy_autocomplete) {
-    $this->request = $request;
+  public function __construct(TaxonomyAutocomplete $taxonomy_autocomplete) {
     $this->taxonomyAutocomplete = $taxonomy_autocomplete;
   }
 
@@ -50,6 +52,8 @@ public function __construct(Request $request, TaxonomyAutocomplete $taxonomy_aut
    *   };
    * @endcode
    *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request containing the search string.
    * @param string $field_name
    *   The name of the term reference field.
    *
@@ -58,8 +62,8 @@ public function __construct(Request $request, TaxonomyAutocomplete $taxonomy_aut
    *   be a json response, else a normal response, so the javascript can handle
    *   the error.
    */
-  public function autocomplete($field_name) {
-    $tags_typed = $this->request->query->get('q');
+  public function autocomplete(Request $request, $field_name) {
+    $tags_typed = $request->query->get('q');
 
     try {
       $matches = $this->taxonomyAutocomplete->getMatches($field_name, $tags_typed);