diff --git a/package-lock.json b/package-lock.json
index 3437dd24b8..cad28f07ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9997,11 +9997,6 @@
         "setimmediate": "1.0.5"
       }
     },
-    "tinymce": {
-      "version": "4.7.6",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.7.6.tgz",
-      "integrity": "sha512-mdbeMvCOO0ws0HXiZO9L8mDGFA9/VmDHltlt+/9qV0Fl1EWKWoPIRURHFtiFYuLKo9yjYUvYucwiZ1XfCT/91Q=="
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
diff --git a/package.json b/package.json
index dc13f7c155..42e223aed8 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "string-replace-webpack-plugin": "0.1.3",
     "style-loader": "0.18.2",
     "svg-inline-loader": "0.8.0",
-    "tinymce": "4.7.6",
     "uglify-js": "2.7.0",
     "underscore": "1.8.3",
     "underscore.string": "3.3.4",
diff --git a/webpack.common.config.js b/webpack.common.config.js
index d9193dfbf7..241c90ab63 100644
--- a/webpack.common.config.js
+++ b/webpack.common.config.js
@@ -130,7 +130,7 @@ module.exports = Merge.smart({
             // https://github.com/webpack/webpack/issues/304#issuecomment-272150177
             // (I've tried every other suggestion solution on that page, this
             // was the only one that worked.)
-            /\/sinon\.js|codemirror-compressed\.js|hls\.js/
+            /\/sinon\.js|codemirror-compressed\.js|hls\.js|tinymce\.full\.min\.js/
         ],
         rules: [
             {
@@ -312,13 +312,14 @@ module.exports = Merge.smart({
             jquery: 'jquery/src/jquery',  // Use the non-diqst form of jQuery for better debugging + optimization
             'jquery.flot': 'flot/jquery.flot.min',
             'jquery.ui': 'jquery-ui.min',
-            'jquery.tinymce': 'tinymce/jquery.tinymce.min',
+            'jquery.tinymce': 'jquery.tinymce.min',
             'jquery.inputnumber': 'html5-input-polyfills/number-polyfill',
             'jquery.qtip': 'jquery.qtip.min',
             'jquery.smoothScroll': 'jquery.smooth-scroll.min',
             'jquery.timepicker': 'timepicker/jquery.timepicker',
             'backbone.associations': 'backbone-associations/backbone-associations-min',
             squire: 'Squire',
+            tinymce: 'tinymce.full.min',
 
             // See sinon/webpack interaction weirdness:
             // https://github.com/webpack/webpack/issues/304#issuecomment-272150177