diff --git a/TODO b/TODO
index d452121c..44a5139c 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+Bugs:
+  Get rid of alias_method_chain dependency
+  Move new is_haml? to stable
+
 Testing:
   Test html2haml
 
diff --git a/lib/haml/helpers/action_view_mods.rb b/lib/haml/helpers/action_view_mods.rb
index 5a92fd65..fcb4a3b7 100644
--- a/lib/haml/helpers/action_view_mods.rb
+++ b/lib/haml/helpers/action_view_mods.rb
@@ -18,7 +18,8 @@ if action_view_included
         @haml_is_haml = was_haml
         res
       end
-      alias_method_chain :render, :haml
+      alias_method :render_without_haml, :render
+      alias_method :render, :render_with_haml
     end
 
     # This overrides various helpers in ActionView
@@ -33,7 +34,8 @@ if action_view_included
             concat_without_haml(string, binding)
           end
         end
-        alias_method_chain :concat, :haml
+        alias_method :concat_without_haml, :concat
+        alias_method :concat, :concat_with_haml
       end
 
       module FormTagHelper
@@ -55,7 +57,8 @@ if action_view_included
             form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
           end
         end
-        alias_method_chain :form_tag, :haml
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
       end
 
       module FormHelper
@@ -71,7 +74,8 @@ if action_view_included
           form_for_without_haml(object_name, *args, &proc)
           concat "\n" if block_given? && is_haml?
         end
-        alias_method_chain :form_for, :haml
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
       end
       # :startdoc:
     end