2 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 44724fc9cb..8e5e5736ab 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -42,6 +42,7 @@ module ActionController
 end
 
 autoload :HTML, 'action_controller/vendor/html-scanner'
+autoload :AbstractController, 'action_controller/abstract'
 
 require 'action_dispatch'
 require 'action_view'
diff --git a/actionpack/lib/action_controller/old_base/layout.rb b/actionpack/lib/action_controller/old_base/layout.rb
index cf5f46a32b..3046e082d9 100644
--- a/actionpack/lib/action_controller/old_base/layout.rb
+++ b/actionpack/lib/action_controller/old_base/layout.rb
@@ -1,8 +1,16 @@
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/class'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/class/inheritable_attributes'
 
 module ActionController #:nodoc:
+  # MegasuperultraHAX
+  # plz refactor ActionMailer
+  class Base
+    @@exempt_from_layout = [ActionView::TemplateHandlers::RJS]
+    cattr_accessor :exempt_from_layout
+  end
+
   module Layout #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)