2 files changed, 21 insertions, 20 deletions
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 2c52cfd90e..34397c3bcf 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -6,12 +6,21 @@ module ActionView
       self.default_format = Mime::XML
 
       def call(template)
-        require 'builder'
+        require_engine
         "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
           "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
+
+      protected
+
+      def require_engine
+        @required ||= begin
+          require "builder"
+          true
+        end
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 77720e2bc8..19b9112afd 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,5 @@
 require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/attribute'
 require 'erubis'
 
 module ActionView
@@ -44,10 +44,6 @@ module ActionView
         class_attribute :erb_trim_mode
         self.erb_trim_mode = '-'
 
-        # Default format used by ERB.
-        class_attribute :default_format
-        self.default_format = Mime::HTML
-
         # Default implementation used.
         class_attribute :erb_implementation
         self.erb_implementation = Erubis
@@ -67,23 +63,19 @@ module ActionView
         end
 
         def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
+          # First, convert to BINARY, so in case the encoding is
+          # wrong, we can still find an encoding tag
+          # (<%# encoding %>) inside the String using a regular
+          # expression
+          template_source = template.source.dup.force_encoding("BINARY")
 
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
+          erb = template_source.gsub(ENCODING_TAG, '')
+          encoding = $2
 
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
+          erb.force_encoding valid_encoding(template.source.dup, encoding)
 
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
+          # Always make sure we return a String in the default_internal
+          erb.encode!
 
           self.class.erb_implementation.new(
             erb,