diff --git a/app/assets/javascripts/activate-account.js.es6 b/app/assets/javascripts/activate-account.js
similarity index 100%
rename from app/assets/javascripts/activate-account.js.es6
rename to app/assets/javascripts/activate-account.js
diff --git a/app/assets/javascripts/auto-redirect.js.es6 b/app/assets/javascripts/auto-redirect.js
similarity index 100%
rename from app/assets/javascripts/auto-redirect.js.es6
rename to app/assets/javascripts/auto-redirect.js
diff --git a/app/assets/javascripts/confirm-new-email/bootstrap.js.es6 b/app/assets/javascripts/confirm-new-email/bootstrap.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/bootstrap.js.es6
rename to app/assets/javascripts/confirm-new-email/bootstrap.js
diff --git a/app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6 b/app/assets/javascripts/confirm-new-email/confirm-new-email.js
similarity index 100%
rename from app/assets/javascripts/confirm-new-email/confirm-new-email.js.es6
rename to app/assets/javascripts/confirm-new-email/confirm-new-email.js
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/auth-token-dropdown.es6
rename to app/assets/javascripts/discourse/components/auth-token-dropdown.js
diff --git a/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb b/app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.es6.erb
rename to app/assets/javascripts/discourse/components/concerns/category-search-priorities.js.erb
diff --git a/app/assets/javascripts/discourse/helpers/loading-spinner.es6 b/app/assets/javascripts/discourse/helpers/loading-spinner.js
similarity index 100%
rename from app/assets/javascripts/discourse/helpers/loading-spinner.es6
rename to app/assets/javascripts/discourse/helpers/loading-spinner.js
diff --git a/app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb b/app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
similarity index 100%
rename from app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb
rename to app/assets/javascripts/discourse/lib/concerns/search-constants.js.erb
diff --git a/app/assets/javascripts/discourse/models/live-post-counts.es6 b/app/assets/javascripts/discourse/models/live-post-counts.js
similarity index 100%
rename from app/assets/javascripts/discourse/models/live-post-counts.es6
rename to app/assets/javascripts/discourse/models/live-post-counts.js
diff --git a/app/assets/javascripts/embed-application.js.es6 b/app/assets/javascripts/embed-application.js
similarity index 100%
rename from app/assets/javascripts/embed-application.js.es6
rename to app/assets/javascripts/embed-application.js
diff --git a/app/assets/javascripts/google-tag-manager.js.es6 b/app/assets/javascripts/google-tag-manager.js
similarity index 100%
rename from app/assets/javascripts/google-tag-manager.js.es6
rename to app/assets/javascripts/google-tag-manager.js
diff --git a/app/assets/javascripts/google-universal-analytics.js.es6 b/app/assets/javascripts/google-universal-analytics.js
similarity index 100%
rename from app/assets/javascripts/google-universal-analytics.js.es6
rename to app/assets/javascripts/google-universal-analytics.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index 3e101328cf6..bbadfa84afa 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -43,11 +43,17 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
       relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
       relative_path.start_with?("app/assets/javascripts/ember-addons/") ||
+      relative_path.start_with?("app/assets/javascripts/confirm-new-email/") ||
       relative_path == "app/assets/javascripts/preload-store.js" ||
       relative_path == "app/assets/javascripts/preload-application-data.js" ||
       relative_path == "app/assets/javascripts/wizard-start.js" ||
       relative_path == "app/assets/javascripts/onpopstate-handler.js" ||
-      relative_path == "app/assets/javascripts/discourse.js"
+      relative_path == "app/assets/javascripts/discourse.js" ||
+      relative_path == "app/assets/javascripts/google-tag-manager.js" ||
+      relative_path == "app/assets/javascripts/google-universal-analytics.js" ||
+      relative_path == "app/assets/javascripts/activate-account.js" ||
+      relative_path == "app/assets/javascripts/auto-redirect.js" ||
+      relative_path == "app/assets/javascripts/embed-application.js"
   end
 
   def self.skip_module?(data)