diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 11128dcf6e..0ae11330e0 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,6 +1,6 @@
 *SVN*
 
-* Performance tweaks: use Set instead of Array to speed up prototype helper include? calls.  Avoid logging code if logger is nil.  #2880, #2881 [Stefan Kaes]
+* Performance tweaks: use Set instead of Array to speed up prototype helper include? calls.  Avoid logging code if logger is nil.  Inline commonly-called template presence checks.  #2880, #2881, #2882 [Stefan Kaes]
 
 * MemCache store may be given multiple addresses.  #2869 [Ryan Carver <ryan@fivesevensix.com>]
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index e5dea1bae2..83bb318ce5 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -273,9 +273,9 @@ module ActionView #:nodoc:
     def pick_template_extension(template_path)#:nodoc:
       if match = delegate_template_exists?(template_path)
         match.first
-      elsif erb_template_exists?(template_path)
+      elsif template_exists?(template_path, :rhtml)
         'rhtml'
-      elsif builder_template_exists?(template_path)
+      elsif template_exists?(template_path, :rxml)
         'rxml'
       else
         raise ActionViewError, "No rhtml, rxml, or delegate template found for #{template_path}"