2 files changed, 4 insertions, 7 deletions
diff --git a/lib/active_storage.rb b/lib/active_storage.rb
index 164525653b..4032fd59a7 100644
--- a/lib/active_storage.rb
+++ b/lib/active_storage.rb
@@ -6,4 +6,6 @@ module ActiveStorage
 
   autoload :Blob
   autoload :Service
+
+  mattr_accessor :verifier
 end
diff --git a/lib/active_storage/engine.rb b/lib/active_storage/engine.rb
index cf21a055be..95ed021ce0 100644
--- a/lib/active_storage/engine.rb
+++ b/lib/active_storage/engine.rb
@@ -22,14 +22,9 @@ module ActiveStorage
       end
     end
 
-    initializer "active_storage.verifiers" do
-      require "active_storage/verified_key_with_expiration"
-      require "active_storage/variation"
-
+    initializer "active_storage.verifier" do
       config.after_initialize do |app|
-        ActiveStorage::VerifiedKeyWithExpiration.verifier = \
-        ActiveStorage::Variation.verifier = \
-          Rails.application.message_verifier("ActiveStorage")
+        ActiveStorage.verifier = Rails.application.message_verifier("ActiveStorage")
       end
     end