From a71350cae0082193ad8c66d65ab62e8bb0b7853b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 16 Feb 2015 15:03:37 -0800
Subject: [PATCH] Revert "Don't unhook autoloading in production"

This reverts commit a8bf12979e5fa15282b39c8cfa315e663f613539.
---
 railties/lib/rails/application/finisher.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7a1bb1e25c..0599e988d9 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -108,6 +108,13 @@ module Rails
           ActionDispatch::Reloader.to_cleanup(&callback)
         end
       end
+
+      # Disable dependency loading during request cycle
+      initializer :disable_dependency_loading do
+        if config.eager_load && config.cache_classes
+          ActiveSupport::Dependencies.unhook!
+        end
+      end
     end
   end
 end