2 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb
index 0428f2a23d..0e058085ec 100644
--- a/actionpack/lib/action_controller/cookies.rb
+++ b/actionpack/lib/action_controller/cookies.rb
@@ -67,6 +67,8 @@ module ActionController #:nodoc:
       cookie = @cookies[name.to_s]
       if cookie && cookie.respond_to?(:value)
         cookie.size > 1 ? cookie.value : cookie.value[0]
+      else
+        cookie
       end
     end
 
diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb
index e783839f34..778c3c256f 100644
--- a/actionpack/lib/action_controller/rack_process.rb
+++ b/actionpack/lib/action_controller/rack_process.rb
@@ -84,10 +84,6 @@ module ActionController #:nodoc:
     end
 
     def out(&block)
-      # Nasty hack because CGI sessions are closed after the normal
-      # prepare! statement
-      set_cookies!
-
       @block = block
       @status = headers.delete("Status")
       if [204, 304].include?(status.to_i)
@@ -132,7 +128,7 @@ module ActionController #:nodoc:
       convert_language!
       convert_expires!
       set_status!
-      # set_cookies!
+      set_cookies!
     end
 
     private