Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.475
diff -u -p -r1.475 form.inc
--- includes/form.inc	7 Jul 2010 01:14:18 -0000	1.475
+++ includes/form.inc	7 Jul 2010 14:54:46 -0000
@@ -853,6 +853,10 @@ function drupal_prepare_form($form_id, &
   }
 
   $form += element_info('form');
+  // Insure that form.js is included on all forms.
+  if (empty($element['#attached']['js']['misc/form.js'])) {
+    $form['#attached']['js']['misc/form.js'] = array('weight' => JS_LIBRARY + 1);
+  }
   $form += array('#tree' => FALSE, '#parents' => array());
 
   if (!isset($form['#validate'])) {
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.945
diff -u -p -r1.945 system.module
--- modules/system/system.module	7 Jul 2010 01:14:18 -0000	1.945
+++ modules/system/system.module	7 Jul 2010 14:54:47 -0000
@@ -279,11 +279,6 @@ function system_element_info() {
     '#method' => 'post',
     '#action' => request_uri(),
     '#theme_wrappers' => array('form'),
-    '#attached' => array(
-      'js' => array(
-        'misc/form.js' => array('weight' => JS_LIBRARY + 1),
-      ),
-    ),
   );
   $types['page'] = array(
     '#show_messages' => TRUE,