1 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 5b8509b2e9..0599e988d9 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -22,8 +22,6 @@ module Rails
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.append do
-            get '/rails/mailers'         => "rails/mailers#index"
-            get '/rails/mailers/*path'   => "rails/mailers#preview"
             get '/rails/info/properties' => "rails/info#properties"
             get '/rails/info/routes'     => "rails/info#routes"
             get '/rails/info'            => "rails/info#index"
@@ -110,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