1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 0cb76ad104..4ecb9edd53 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -42,8 +42,8 @@ class Dispatcher
         Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController)
         Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
         ActiveRecord::Base.reset_associations_loaded
-        ActiveRecord::Base.subclasses.each { |klass| klass.reset_inheritable_attributes }
-      end      
+        ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+      end
     end
   end