diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index 79b189e..03c21db 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -195,7 +195,7 @@ public function buildForm($form_id, &$form_state) {
     $form_state += $this->getFormStateDefaults();
 
     if (!isset($form_state['input'])) {
-      $form_state['input'] = $form_state['method'] == 'get' ? $this->request->query->all() : $this->request->request->all();
+      $form_state['input'] = $form_state['method'] == 'get' ? $_GET : $_POST;
     }
 
     if (isset($_SESSION['batch_form_state'])) {