2 files changed, 1 insertions, 10 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 242c44a6eb..adef2d5cf0 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -10,14 +10,6 @@ module AbstractController
     end
   end
 
-  class UnsupportedOperationError < Error
-    DEFAULT_MESSAGE = "Unsupported render operation. BasicRendering supports only :text and :nothing options. For more, you need to include ActionView."
-
-    def initialize
-      super DEFAULT_MESSAGE
-    end
-  end
-
   module Rendering
     extend ActiveSupport::Concern
 
@@ -55,7 +47,7 @@ module AbstractController
     # Performs the actual template rendering.
     # :api: public
     def render_to_body(options = {})
-      raise UnsupportedOperationError
+      raise NotImplementedError, "no render operation defined"
     end
 
     # Return Content-Type of rendered content
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d6b1908ccb..417d2efec2 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -13,7 +13,6 @@ module ActionController
   autoload :Middleware
 
   autoload_under "metal" do
-    autoload :BasicRendering, 'action_controller/metal/rendering'
     autoload :Compatibility
     autoload :ConditionalGet
     autoload :Cookies