Forgot to move that line to railtie on rebase

actionpack/lib/action_controller/railties/paths.rb

@@ -11,7 +11,7 @@ def self.with(app)
               klass.helpers_path = app.config.helpers_paths
             end
 
-            klass.helper :all
+            klass.helper :all if klass.superclass == ActionController::Base
           end
         end
       end