1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 82b12f3a7b..8356b8ce55 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -397,13 +397,7 @@ module ActionController
         merged = recall.merge(options)
         expire_on = Routing.expiry_hash(options, recall)
     
-        path, keys = generate_path(merged, options, expire_on)
-    
-        # Factor out?
-        extras = {}
-        k = nil
-        keys.each {|k| extras[k] = options[k]} 
-        [path, extras]
+        generate_path(merged, options, expire_on)
       end
       
       def generate_path(merged, options, expire_on)
@@ -590,7 +584,7 @@ module ActionController
       end
 
       def extra_keys(options, recall = {})
-        generate(options.dup, recall).last.keys
+        generate(options.dup, recall).last
       end
     end