diff --git a/vendor/assets/javascripts/loader.js b/app/assets/javascripts/discourse-loader.js
similarity index 83%
rename from vendor/assets/javascripts/loader.js
rename to app/assets/javascripts/discourse-loader.js
index 61f4a1c767f..4f36e91a393 100644
--- a/vendor/assets/javascripts/loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -2,6 +2,14 @@ var define, requireModule, require, requirejs;
 
 (function() {
 
+  var MOVED_MODULES = {
+    "discourse/views/list/post-count-or-badges": "discourse/raw-views/list/post-count-or-badges",
+    "discourse/views/list/posts-count-column" : "discourse/raw-views/list/posts-count-column",
+    "discourse/views/list/visited-line" : "discourse/raw-views/list/visited-line",
+    "discourse/views/topic-list-header-column" : "discourse/raw-views/topic-list-header-column",
+    "discourse/views/topic-status" : "discourse/raw-views/topic-status"
+  };
+
   var _isArray;
   if (!Array.isArray) {
     _isArray = function (x) {
@@ -48,7 +56,7 @@ var define, requireModule, require, requirejs;
     return this._require || (this._require = function(dep) {
       return require(resolve(dep, name));
     });
-  }
+  };
 
   define = function(name, deps, callback) {
     if (arguments.length < 2) {
@@ -76,7 +84,7 @@ var define, requireModule, require, requirejs;
     return new Alias(path);
   };
 
-  function reify(mod, name, seen) {
+  function reify(mod, name, rseen) {
     var deps = mod.deps;
     var length = deps.length;
     var reified = new Array(length);
@@ -88,11 +96,11 @@ var define, requireModule, require, requirejs;
     for (var i = 0, l = length; i < l; i++) {
       dep = deps[i];
       if (dep === 'exports') {
-        module.exports = reified[i] = seen;
+        module.exports = reified[i] = rseen;
       } else if (dep === 'require') {
         reified[i] = mod.makeRequire();
       } else if (dep === 'module') {
-        mod.exports = seen;
+        mod.exports = rseen;
         module = reified[i] = mod;
       } else {
         reified[i] = requireFrom(resolve(dep, name), name);
@@ -106,7 +114,16 @@ var define, requireModule, require, requirejs;
   }
 
   function requireFrom(name, origin) {
+
     var mod = registry[name];
+    if (!mod) {
+      var moved = MOVED_MODULES[name];
+      if (moved) {
+        console.warn("DEPRECATION: `" + name + "` was moved to `" + moved + "`");
+      }
+      mod = registry[moved];
+    }
+
     if (!mod) {
       throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
     }
@@ -116,8 +133,9 @@ var define, requireModule, require, requirejs;
   function missingModule(name) {
     throw new Error('Could not find module ' + name);
   }
+
   requirejs = require = requireModule = function(name) {
-    var mod = registry[name];
+    var mod = registry[name] || registry[MOVED_MODULES[name]];
 
 
     if (mod && mod.callback instanceof Alias) {
@@ -189,6 +207,6 @@ var define, requireModule, require, requirejs;
   requirejs.entries = requirejs._eak_seen = registry;
   requirejs.clear = function() {
     requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = state = {};
+    seen = {};
   };
 })();
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index 23e6b286b18..8c0c4b784f5 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -1,5 +1,5 @@
 //= require env
 //= require jquery_include
 //= require ember_include
-//= require loader
+//= require discourse-loader
 //= require ember-shim
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 699abf0174f..1c3b18a4776 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -2,7 +2,7 @@
 
 //= require env
 //= require jquery.debug
-//= require loader
+//= require discourse-loader
 //= require jquery.debug
 //= require handlebars
 //= require ember.debug
diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb
index 10bfb783742..4810aae4c31 100644
--- a/lib/discourse_iife.rb
+++ b/lib/discourse_iife.rb
@@ -34,6 +34,8 @@ class DiscourseIIFE
     return data if path =~ /\.hbrs/
     return data if path =~ /\.hbs/
 
+    return data if path =~ /discourse-loader/
+
     "(function () {\n\nvar $ = window.jQuery;\n// IIFE Wrapped Content Begins:\n\n#{data}\n\n// IIFE Wrapped Content Ends\n\n })(this);"
   end
 
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 412ca02d3a2..d9c08d7b2b5 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -59,7 +59,7 @@ module PrettyText
       ctx.attach("console.log", proc{|l| p l })
     end
 
-    ctx_load(ctx, "vendor/assets/javascripts/loader.js")
+    ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
     manifest = File.read("#{Rails.root}/app/assets/javascripts/pretty-text-bundle.js")
     root_path = "#{Rails.root}/app/assets/javascripts/"