rails-api.diff

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 952a035..f4c9cfd 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -42,10 +42,6 @@ module ActionController
     autoload :UrlFor
   end

-  autoload_under "api" do
-    autoload :ApiRendering
-  end
-
   autoload :TestCase,           'action_controller/test_case'
   autoload :TemplateAssertions, 'action_controller/test_case'

diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index f9cbbf2..2b31ed2 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -127,7 +127,7 @@ module ActionController

       UrlFor,
       Redirecting,
-      ApiRendering,
+      Rendering,
       Renderers::All,
       ConditionalGet,
       RackDelegation,
diff --git a/actionpack/lib/action_controller/api/api_rendering.rb b/actionpack/lib/action_controller/api/api_rendering.rb
deleted file mode 100644
index 3a08d28..0000000
--- a/actionpack/lib/action_controller/api/api_rendering.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module ActionController
-  module ApiRendering
-    extend ActiveSupport::Concern
-
-    included do
-      include Rendering
-    end
-
-    def render_to_body(options = {})
-      _process_options(options)
-      super
-    end
-  end
-end