diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index d6f75bded0047feae94ad35532f1211f8ac1054f..10aa34c76bcfce532bbda66eaa581e073f0e7bcd 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -139,7 +139,7 @@ module AbstractController
   #
   #   end
   #
-  # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will 
+  # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will
   # be rendered directly, without wrapping a layout around the rendered view.
   #
   # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so
@@ -167,6 +167,7 @@ module Layouts
 
     included do
       class_attribute :_layout_conditions
+      remove_possible_method :_layout_conditions
       delegate :_layout_conditions, :to => :'self.class'
       self._layout_conditions = {}
       _write_layout_method
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index 1777a4b32d909485d3811f7210d5994ecfc5dd50..41f9a76b131c4ade17a14a6a18111ae47923748e 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -127,10 +127,6 @@ def delegate(*methods)
         end
 
       module_eval(<<-EOS, file, line - 5)
-        if instance_methods(false).map(&:to_s).include?("#{prefix}#{method}")
-          remove_possible_method("#{prefix}#{method}")
-        end
-
         def #{prefix}#{method}(*args, &block)               # def customer_name(*args, &block)
           #{to}.__send__(#{method.inspect}, *args, &block)  #   client.__send__(:name, *args, &block)
         rescue NoMethodError                                # rescue NoMethodError