Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/form.inc,v
retrieving revision 1.8
diff -u -r1.8 form.inc
--- includes/form.inc	11 Jul 2009 19:34:30 -0000	1.8
+++ includes/form.inc	17 Jul 2009 20:28:42 -0000
@@ -161,6 +161,10 @@
     $form_build_id = 'form-' . md5(mt_rand());
   }
   $form['#build_id'] = $form_build_id;
+  // Flush form ID element cache because we may be rebuilding
+  // a form in a way that Drupal's FAPI isn't used to which 
+  // causes unnecessary form ID changes. 
+  form_clean_id(NULL, TRUE);
   drupal_prepare_form($form_id, $form, $form_state);
 
   if (empty($form['#no_cache'])) {