diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index 593e91a2f70..e83cebea5e1 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -190,7 +190,7 @@ class Admin::ThemesController < Admin::AdminController
 
         response.headers['Content-Disposition'] = "attachment; filename=#{@theme.name.parameterize}.dcstyle.json"
         response.sending_file = true
-        render json: ::ThemeWithEmbeddedUploadsSerializer.new(@theme, root: 'theme')
+        render json: ThemeWithEmbeddedUploadsSerializer.new(@theme, root: 'theme')
       end
     end
 
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 08a110dc940..78532e399a9 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -91,3 +91,7 @@ class ThemeFieldWithEmbeddedUploadsSerializer < ThemeFieldSerializer
     Base64.encode64(raw)
   end
 end
+
+class ThemeWithEmbeddedUploadsSerializer < ThemeSerializer
+  has_many :theme_fields, serializer: ThemeFieldWithEmbeddedUploadsSerializer, embed: :objects
+end
diff --git a/app/serializers/theme_with_embedded_uploads_serializer.rb b/app/serializers/theme_with_embedded_uploads_serializer.rb
deleted file mode 100644
index d54035cf1ab..00000000000
--- a/app/serializers/theme_with_embedded_uploads_serializer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ThemeWithEmbeddedUploadsSerializer < ThemeSerializer
-  has_many :theme_fields, serializer: ThemeFieldWithEmbeddedUploadsSerializer, embed: :objects
-end