diff --git a/app/javascript/locales/index.js b/app/javascript/locales/index.js
deleted file mode 100644
index 6e57e3ddc..000000000
--- a/app/javascript/locales/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-let theLocale;
-
-export function setLocale(locale) {
-  theLocale = locale;
-}
-
-export function getLocale() {
-  return theLocale;
-}
-
-export function onProviderError(error) {
-  // Silent the error, like upstream does
-  if(process.env.NODE_ENV === 'production') return;
-
-  // This browser does not advertise Intl support for this locale, we only print a warning
-  // As-per the spec, the browser should select the best matching locale
-  if(typeof error === "object" && error.message.match("MISSING_DATA")) {
-    console.warn(error.message);
-  }
-
-  console.error(error);
-}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index af5dc799b..2267ec529 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -26,7 +26,7 @@
 
     %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
 
-    = javascript_pack_tag "locales", crossorigin: 'anonymous'
+    = javascript_pack_tag "common", crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
         = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index a5f9514b4..42f61a180 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -12,7 +12,7 @@
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
     = render_initial_state
-    = javascript_pack_tag 'locales', crossorigin: 'anonymous'
+    = javascript_pack_tag 'common', crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
         = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 55da5de3f..d3210c33f 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,7 +5,7 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-    = javascript_pack_tag "locales", crossorigin: 'anonymous'
+    = javascript_pack_tag "common", crossorigin: 'anonymous'
     = render partial: 'layouts/theme', object: (@core || { pack: 'common' })
     = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } })
   %body.error
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index 6fc238c72..d34e15538 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -1,6 +1,6 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'locales', crossorigin: 'anonymous'
+  = javascript_pack_tag 'common', crossorigin: 'anonymous'
   - if @theme
     - if @theme[:supported_locales].include? I18n.locale.to_s
       = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 1f330cb66..768bd7bf3 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -47,7 +47,6 @@ function reducePacks (data, into = {}) {
 }
 
 const entries = Object.assign(
-  { locales: resolve('app', 'javascript', 'locales') },
   reducePacks(core),
   Object.values(flavours).reduce((map, data) => reducePacks(data, map), {}),
 );
@@ -67,7 +66,7 @@ module.exports = {
 
   optimization: {
     runtimeChunk: {
-      name: 'locales',
+      name: 'common',
     },
     splitChunks: {
       cacheGroups: {