Remaining cleanup from changes to AssetTagHelper

actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb

@@ -187,12 +187,8 @@ module ActionView
         #
         #   javascript_include_tag :all, :cache => true, :recursive => true
         def javascript_include_tag(*sources)
-          if config.use_sprockets
-            sprockets_javascript_include_tag(*sources)
-          else
-            @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
-            @javascript_include.include_tag(*sources)
-          end
+          @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
+          @javascript_include.include_tag(*sources)
         end
       end
     end

actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

@@ -137,12 +137,8 @@ module ActionView
         #   stylesheet_link_tag :all, :concat => true
         #
         def stylesheet_link_tag(*sources)
-          if config.use_sprockets
-            sprockets_stylesheet_link_tag(*sources)
-          else
-            @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
-            @stylesheet_include.include_tag(*sources)
-          end
+          @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
+          @stylesheet_include.include_tag(*sources)
         end
 
       end

actionpack/lib/sprockets/helpers/rails_helper.rb

@@ -4,6 +4,9 @@ require "action_view/helpers/asset_tag_helper"
 module Sprockets
   module Helpers
     module RailsHelper
+      extend ActiveSupport::Concern
+      include ActionView::Helpers::AssetTagHelper
+
       def asset_paths
         @asset_paths ||= begin
           config     = self.config if respond_to?(:config)

actionpack/lib/sprockets/railtie.rb

@@ -36,6 +36,8 @@ module Sprockets
       app.assets = asset_environment(app)
 
       ActiveSupport.on_load(:action_view) do
+        include ::Sprockets::Helpers::RailsHelper
+
         app.assets.context_class.instance_eval do
           include ::Sprockets::Helpers::RailsHelper
         end