diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 25c05f1c305..cee3fcbd57f 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,9 +1,7 @@
 import { buildResolver } from 'discourse-common/resolver';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
-import PreloadStore from 'preload-store';
 
 const _pluginCallbacks = [];
-const _pluginDefinitions = {};
 
 const Discourse = Ember.Application.extend({
   rootElement: '#main',
@@ -103,16 +101,6 @@ const Discourse = Ember.Application.extend({
 
     $('noscript').remove();
 
-    // Load plugin definions.
-    const disabledPlugins = PreloadStore.get('site').disabled_plugins;
-    Object.keys(_pluginDefinitions).forEach((key) => {
-      if(!(disabledPlugins.includes(key))){ // Not disabled, so load it
-        _pluginDefinitions[key].forEach((func) => {
-          func();
-        });
-      }
-    });
-
     Object.keys(requirejs._eak_seen).forEach(function(key) {
       if (/\/pre\-initializers\//.test(key)) {
         const module = requirejs(key, null, null, true);
@@ -166,13 +154,6 @@ const Discourse = Ember.Application.extend({
     _pluginCallbacks.push({ version, code });
   },
 
-  _registerPluginScriptDefinition(pluginName, definition) {
-    if(!(pluginName in _pluginDefinitions)){
-      _pluginDefinitions[pluginName] = [];
-    }
-    _pluginDefinitions[pluginName].push(definition);
-  },
-
   assetVersion: Ember.computed({
     get() {
       return this.get("currentAssetVersion");
diff --git a/app/models/site.rb b/app/models/site.rb
index cfeae213a10..9d90b2c1bc3 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -87,8 +87,7 @@ class Site
         filters: Discourse.filters.map(&:to_s),
         user_fields: UserField.all.map do |userfield|
           UserFieldSerializer.new(userfield, root: false, scope: guardian)
-        end,
-        disabled_plugins: Discourse.disabled_plugin_names
+        end
       }.to_json
     end
 
diff --git a/config/initializers/014-wrap_plugin_js.rb b/config/initializers/014-wrap_plugin_js.rb
deleted file mode 100644
index bbf13ab3568..00000000000
--- a/config/initializers/014-wrap_plugin_js.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'discourse_wrap_plugin_js'
-
-Rails.application.config.assets.configure do |env|
-  env.register_preprocessor('application/javascript', DiscourseWrapPluginJS)
-end
diff --git a/lib/discourse_wrap_plugin_js.rb b/lib/discourse_wrap_plugin_js.rb
deleted file mode 100644
index 67cc850bd03..00000000000
--- a/lib/discourse_wrap_plugin_js.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class DiscourseWrapPluginJS
-  def initialize(options = {}, &block)
-  end
-
-  def self.instance
-    @instance ||= new
-  end
-
-  def self.call(input)
-    instance.call(input)
-  end
-
-  # Add stuff around javascript
-  def call(input)
-    path = input[:environment].context_class.new(input).pathname.to_s
-    data = input[:data]
-
-    # Only apply to plugin paths
-    return data unless (path =~ /\/plugins\//)
-
-    # Find the folder name of the plugin
-    folder_name = path[/\/plugins\/(\S+?)\//, 1]
-
-    # Lookup plugin name
-    plugin = Discourse.plugins.find { |p| p.path =~ /\/plugins\/#{folder_name}\// }
-    plugin_name = plugin.name
-
-    "Discourse._registerPluginScriptDefinition('#{plugin_name}', function(){#{data}}); \n"
-  end
-
-end