diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index c594d8a..dc3016c 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -857,7 +857,6 @@ public function doBuildForm($form_id, &$element, FormStateInterface &$form_state
             $form_state->setInvalidToken(TRUE);
 
             // Make sure file uploads do not get processed.
-            $_FILES = array();
             $this->requestStack->getCurrentRequest()->files = new FileBag();
           }
         }
diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index efcdedc..1c62433 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -764,10 +764,10 @@ public function testInvalidToken($expected, $valid_token, $user_is_authenticated
 
   public function providerTestInvalidToken() {
     $data = [];
-    $data[] = [TRUE, FALSE, TRUE];
-    $data[] = [FALSE, TRUE, TRUE];
-    $data[] = [FALSE, NULL, FALSE];
-    $data[] = [FALSE, NULL, FALSE];
+    $data['authenticated_invalid'] = [TRUE, FALSE, TRUE];
+    $data['authenticated_valid'] = [FALSE, TRUE, TRUE];
+    // If the user is not authenticated, we will not have a token.
+    $data['anonymous'] = [FALSE, NULL, FALSE];
     return $data;
   }