1 files changed, 9 insertions, 7 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index af3623e97e..92d2971ec3 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -4,11 +4,13 @@ require "active_support/core_ext/module/delegation"
 module AbstractController
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Callbacks
-  autoload :Helpers
-  autoload :Layouts
-  autoload :LocalizedCache
-  autoload :Logger
-  autoload :RenderingController
+  deferrable do
+    autoload :Base
+    autoload :Callbacks
+    autoload :Helpers
+    autoload :Layouts
+    autoload :LocalizedCache
+    autoload :Logger
+    autoload :RenderingController
+  end
 end