diff --git a/edit.module b/edit.module
index aaf1466..64b04d9 100644
--- a/edit.module
+++ b/edit.module
@@ -623,7 +623,7 @@ function edit_preprocess_field(&$variables) {
       // @todo: research a more elegant solution, at least document this.
       $wysiwyg_module = variable_get(EDIT_WYSIWYG_VARIABLE, EDIT_WYSIWYG_DEFAULT);
       $function = $wysiwyg_module . '_add_format_settings';
-      $function();
+      // $function();
 
       // Let the JavaScript logic know whether transformation filters are used
       // in this format, so it can decide whether to re-render the text or not.
diff --git a/js/ui-editables.js b/js/ui-editables.js
index 238689a..ef227d8 100644
--- a/js/ui-editables.js
+++ b/js/ui-editables.js
@@ -3,35 +3,36 @@
 /**
  * @file ui-editables.js
  *
- * UI components for editables: toolbar, form.
+ * UI components for editables: form.
  */
 
 Drupal.edit = Drupal.edit || {};
 
 Drupal.edit.form = {
   create: function($editable, cb) {
+    var entity = Drupal.edit.vie.entities.get(Drupal.edit.util.getElementSubject($editable));
+    var predicate = Drupal.edit.util.getElementPredicate($editable);
+    var edit_id = entity.getSubjectUri() + ':' + predicate;
+    var $field = Drupal.edit.util.findFieldForEditable($editable);
+    // @todo: this needs to be refactored, we should have access to the view
+    // rather than the $editable/$el of the view.
+    // moreover, we should probably be de-coupling this and trigger events
+    // instead of mucking with the toolbar from here.
+    var toolbarView = Drupal.edit.state.get('editedFieldView').getToolbarView();
+    var $toolbar = toolbarView.getToolbarElement();
+    // We only create a placeholder-div/form for the form-based instances.
     if (Drupal.edit.form.get($editable).length > 0) {
       return false;
     }
     else {
-      var entity = Drupal.edit.vie.entities.get(Drupal.edit.util.getElementSubject($editable));
-      var predicate = Drupal.edit.util.getElementPredicate($editable);
-      var edit_id = entity.getSubjectUri() + ':' + predicate;
-      var $field = Drupal.edit.util.findFieldForEditable($editable);
-      // @todo: this needs to be refactored, we should have access to the view
-      // rather than the $editable/$el of the view.
-      // moreover, we should probably be de-coupling this and trigger events
-      // instead of mucking with the toolbar from here.
-      var toolbarView = Drupal.edit.state.get('editedFieldView').getToolbarView();
-      var $toolbar = toolbarView.getToolbarElement();
       // Indicate in the 'info' toolgroup that the form is loading. Animated.
       setTimeout(function() {
-        $toolbar.addClass($editable, 'info', 'loading');
+        toolbarView.addClass('info', 'loading');
       }, 0);
 
       // Indicate in the 'info' toolgroup that the form is loading.
       // Drupal.edit.toolbar.addClass($editable, 'primary', 'info', 'loading');
-      $toolbar.addClass('info', 'loading');
+      toolbarView.addClass('info', 'loading');
 
       // Render form container.
       var $form = $(Drupal.theme('editFormContainer', {