diff --git a/core/includes/form.inc b/core/includes/form.inc
index a555bf0..591edc4 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -987,6 +987,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
     '#value' => $form['#build_id'],
     '#id' => $form['#build_id'],
     '#name' => 'form_build_id',
+    '#tree' => FALSE,
   );
 
   // Add a token, based on either #token or form_id, to any form displayed to
@@ -1010,6 +1011,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
         '#id' => drupal_html_id('edit-' . $form_id . '-form-token'),
         '#type' => 'token',
         '#default_value' => drupal_get_token($form['#token']),
+        '#tree' => FALSE,
       );
     }
   }
@@ -1019,6 +1021,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) {
       '#type' => 'hidden',
       '#value' => $form_id,
       '#id' => drupal_html_id("edit-$form_id"),
+      '#tree' => FALSE,
     );
   }
   if (!isset($form['#id'])) {