diff --git a/lib/editor/tinymce/module.js b/lib/editor/tinymce/module.js
index 0968968f0d0..eedc3e1146b 100644
--- a/lib/editor/tinymce/module.js
+++ b/lib/editor/tinymce/module.js
@@ -25,14 +25,24 @@ M.editor_tinymce = M.editor_tinymce || {};
 
 M.editor_tinymce.editor_options = M.editor_tinymce.options || {};
 M.editor_tinymce.filepicker_options = M.editor_tinymce.filepicker_options || {};
-M.editor_tinymce.langs_loaded = false;
+M.editor_tinymce.initialised = false;
 
 M.editor_tinymce.init_editor = function(Y, editorid, options) {
 
-    // Load all language strings for all plugins - we do not use standard TinyMCE lang pack loading!
-    if (!M.editor_tinymce.langs_loaded) {
+    if (!M.editor_tinymce.initialised) {
+        // Load all language strings for all plugins - we do not use standard TinyMCE lang pack loading!
         tinymce.ScriptLoader.add(M.cfg.wwwroot + '/lib/editor/tinymce/all_strings.php?elanguage=' + options.language + '&rev=' + options.langrev);
-        M.editor_tinymce.langs_loaded = true;
+
+        // Monkey patch for MDL-35284 - this hack ignores empty toolbars.
+        tinymce.ui.Toolbar.prototype.oldRenderHTML = tinymce.ui.Toolbar.prototype.renderHTML;
+        tinymce.ui.Toolbar.prototype.renderHTML = function() {
+            if (this.controls.length == 0) {
+                return;
+            }
+            return tinymce.ui.Toolbar.prototype.oldRenderHTML.call(this);
+        };
+
+        M.editor_tinymce.initialised = true;
     }
 
     M.editor_tinymce.editor_options[editorid] = options;
diff --git a/lib/editor/tinymce/version.php b/lib/editor/tinymce/version.php
index 904cf01ec0c..fadb77e5d5f 100644
--- a/lib/editor/tinymce/version.php
+++ b/lib/editor/tinymce/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2012090900;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2012091000;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2012083100;        // Requires this Moodle version
 $plugin->component = 'editor_tinymce';  // Full name of the plugin (used for diagnostics)
 $plugin->release   = '3.6.0';           // This is NOT a directory name, see lib.php if you need to know where is the editor code!