diff --git a/build_support/editor_textarea.html b/build_support/editor_textarea.html
index 9de8ca42..e8a97007 100644
--- a/build_support/editor_textarea.html
+++ b/build_support/editor_textarea.html
@@ -60,7 +60,7 @@ function inject(callback) {
         };
     };
 
-    load('ace-uncompressed-noconflict.js', "ace/ext/textarea", function() {
+    load('ace-bookmarklet.js', "ace/ext/textarea", function() {
         var ace = window.__ace_shadowed__;
         
         ace.options.mode = "javascript";
diff --git a/lib/ace/ext/textarea.js b/lib/ace/ext/textarea.js
index 8efb886c..db97dc57 100644
--- a/lib/ace/ext/textarea.js
+++ b/lib/ace/ext/textarea.js
@@ -274,7 +274,7 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
                 case "mode":
                     if (value != "text") {
                         // Load the required mode file. Files get loaded only once.
-                        loader("mode-" + value + "-noconflict.js", "ace/mode/" + value, function() {
+                        loader("mode-" + value + ".js", "ace/mode/" + value, function() {
                             var aceMode = require("../mode/" + value).Mode;
                             session.setMode(new aceMode());
                         });
@@ -286,7 +286,7 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
                 case "theme":
                     if (value != "textmate") {
                         // Load the required theme file. Files get loaded only once.
-                        loader("theme-" + value + "-noconflict.js", "ace/theme/" + value, function() {
+                        loader("theme-" + value + ".js", "ace/theme/" + value, function() {
                             editor.setTheme("ace/theme/" + value);
                         });
                     } else {