1 files changed, 23 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 2f31073055..bb34751f64 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -95,22 +95,29 @@ module ActionController #:nodoc:
         @session["__valid_session"]
         return @session
       rescue ArgumentError => e
-        if e.message =~ %r{undefined class/module (\w+)}
-          begin
-            Module.const_missing($1)
-          rescue LoadError, NameError => e
-            raise(
-              ActionController::SessionRestoreError, 
-              "Session contained objects where the class definition wasn't available. " +
-              "Remember to require classes for all objects kept in the session. " +
-              "(Original exception: #{e.message} [#{e.class}])"
-            )
-          end
-
-          retry
-        else
-          raise
-        end
+        # TODO: Uncomment this on 0.13.1
+        # if e.message =~ %r{undefined class/module (\w+)}
+        #   begin
+        #     Module.const_missing($1)
+        #   rescue LoadError, NameError => e
+        #     raise(
+        #       ActionController::SessionRestoreError, 
+        #       "Session contained objects where the class definition wasn't available. " +
+        #       "Remember to require classes for all objects kept in the session. " +
+        #       "(Original exception: #{e.message} [#{e.class}])"
+        #     )
+        #   end
+        # 
+        #   retry
+        # else
+        #   raise
+        # end
+        raise(
+          ActionController::SessionRestoreError, 
+          "Session contained objects where the class definition wasn't available. " +
+          "Remember to require classes for all objects kept in the session. " +
+          "(Original exception: #{e.message} [#{e.class}])"
+        )
       end
     end