2 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 74e24c9321..6e8b12d379 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -4,9 +4,6 @@ module ActionController
 
     # Temporary hax
     included do
-      ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
-      ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
-
       # ROUTES TODO: This should be handled by a middleware and route generation
       # should be able to handle SCRIPT_NAME
       self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 07024d0a9a..ece9ba3725 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -43,4 +43,4 @@ module ActionController
 
   class UnknownHttpMethod < ActionControllerError #:nodoc:
   end
-end
-\ No newline at end of file
+end