diff

diff --git a/vendor/rails/activesupport/lib/active_support/dependencies.rb b/vendor/rails/activesupport/lib/active_support/dependencies.rb
index 2badad5..f95de5d 100644
--- a/vendor/rails/activesupport/lib/active_support/dependencies.rb
+++ b/vendor/rails/activesupport/lib/active_support/dependencies.rb
@@ -411,7 +411,9 @@ module ActiveSupport #:nodoc:
       from_mod = Object if from_mod.name.blank?
 
       unless qualified_const_defined?(from_mod.name) && from_mod.name.constantize.object_id == from_mod.object_id
-        raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
+        # assume we should just use the new constant instead of the old
+        from_mod = from_mod.name.constantize
+        #raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
       end
 
       raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)