diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index efc35a7e56a19eb9245d9bfe19e40625badeb2b5..725d8fb8fc3ae04966c6ede2642cc1a2dca9c050 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -15,5 +15,6 @@ module AbstractController
   autoload :LocalizedCache
   autoload :Logger
   autoload :Rendering
+  autoload :Translation
   autoload :UrlFor
 end
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 644419a585ca4b64b5b1066ee4c8826680f6bc2f..826e82c8c68e1d8434955ffc474a84e401d51ce2 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -42,7 +42,7 @@ def view_context
     # Delegates render_to_body and sticks the result in self.response_body.
     def render(*args, &block)
       if response_body
-        raise AbstractController::DoubleRenderError, "Can only render or redirect once per action"
+        raise AbstractController::DoubleRenderError
       end
 
       options = _normalize_options(*args, &block)
diff --git a/actionpack/lib/action_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb
similarity index 87%
rename from actionpack/lib/action_controller/translation.rb
rename to actionpack/lib/abstract_controller/translation.rb
index 65e9eddb0a2e5e5cb59c4cbccf84f6eb695e83d6..6d68cf4944c157ebe9ab42df877046121db331f3 100644
--- a/actionpack/lib/action_controller/translation.rb
+++ b/actionpack/lib/abstract_controller/translation.rb
@@ -1,4 +1,4 @@
-module ActionController
+module AbstractController
   module Translation
     def translate(*args)
       I18n.translate(*args)
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8bc2cc79d2d3d0b652031f9c42022f38a2f47f1f..fa4a253ec1a7b6b4d4587faf3e86fdf4ff1ef8db 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -8,7 +8,6 @@ module ActionController
   autoload :Base
   autoload :Caching
   autoload :PolymorphicRoutes
-  autoload :Translation
   autoload :Metal
   autoload :Middleware
 
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4f928e37eaf96babad2695f6f3f34abf6a2cd0a0..21a811c004276a022faaaac1ec666fb11186281e 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -4,6 +4,7 @@ class Base < Metal
 
     include AbstractController::Callbacks
     include AbstractController::Layouts
+    include AbstractController::Translation
 
     include ActionController::Helpers
     helper :all # By default, all helpers should be included
@@ -33,7 +34,6 @@ class Base < Metal
     include ActionController::Streaming
     include ActionController::HttpAuthentication::Basic::ControllerMethods
     include ActionController::HttpAuthentication::Digest::ControllerMethods
-    include ActionController::Translation
 
     # Add instrumentations hooks at the bottom, to ensure they instrument
     # all the methods properly.
diff --git a/actionpack/test/controller/translation_test.rb b/actionpack/test/abstract/translation_test.rb
similarity index 100%
rename from actionpack/test/controller/translation_test.rb
rename to actionpack/test/abstract/translation_test.rb