1 files changed, 6 insertions, 13 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 0f9d35d062..dada64a86f 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,9 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
 require 'active_support/ruby/shim'
 require 'active_support/core_ext/class/attribute_accessors'
 
@@ -33,14 +30,15 @@ module ActionView
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :Base
     autoload :Context
-    autoload :Template
     autoload :Helpers
-    autoload :Base
     autoload :LookupContext
-    autoload :Render
-    autoload :PathSet,        "action_view/paths"
-    autoload :TestCase,       "action_view/test_case"
+    autoload :Partials
+    autoload :PathSet
+    autoload :Rendering
+    autoload :Template
+    autoload :TestCase
 
     autoload_under "renderer" do
       autoload :AbstractRenderer
@@ -48,11 +46,6 @@ module ActionView
       autoload :TemplateRenderer
     end
 
-    autoload_under "render" do
-      autoload :Partials
-      autoload :Rendering
-    end
-
     autoload_at "action_view/template/resolver" do
       autoload :Resolver
       autoload :PathResolver