diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index <HASH>..<HASH> 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -80,24 +80,16 @@ module Formtastic
       end
     end
     
-    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
     def escape_html_entities(string) #:nodoc:
-      if builder
-        if builder.escape_html_entities_in_hints_and_labels
-          # Acceppt html_safe flag as indicator to skip escaping
-          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-        end
-        string
-      else
-        super
+      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) || escape_html_entities_in_hints_and_labels
+        string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
       end
+      string
     end
     
-    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
     def i18n_lookups_by_default
-      respond_to?(:builder) ? builder.i18n_lookups_by_default : super
+      respond_to?(:builder) ? builder.i18n_lookups_by_default : i18n_lookups_by_default
     end
     
-    
   end
 end
\ No newline at end of file
hack to make LocalizedString work when included inside an Input, or inside a FormBuilder