Revert "Merge pull request #5750 from ahoward/master"

This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing
changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a.
The reverted commit improved the performance in the wrong place, now we
have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.

1 files changed, 1 insertions, 10 deletions

diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 12ae2456d6..d75bb1c2de 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -147,16 +147,7 @@ module ActionDispatch
         when nil
           _routes.url_for(url_options.symbolize_keys)
         when Hash
-          symbolized = {}
-          options.keys.each do |k|
-            sym = k.to_sym
-            symbolized[sym] = options[k] unless symbolized.has_key?(sym)
-          end
-          url_options.keys.each do |k|
-            sym = k.to_sym
-            symbolized[sym] = url_options[k] unless symbolized.has_key?(sym)
-          end
-          _routes.url_for(symbolized)
+          _routes.url_for(options.symbolize_keys.reverse_merge!(url_options))
         when String
           options
         else