diff --git a/lib/assets/javascripts/nested_form_fields.js.coffee b/lib/assets/javascripts/nested_form_fields.js.coffee
index 3f06cce..b5afc63 100644
--- a/lib/assets/javascripts/nested_form_fields.js.coffee
+++ b/lib/assets/javascripts/nested_form_fields.js.coffee
@@ -22,12 +22,7 @@ nested_form_fields.bind_nested_forms_links = () ->
 	# look for replacements in user defined code and substitute with the index
     template_html = template_html.replace(new RegExp("__nested_field_for_replace_with_index__","g"), added_index)
 
-    # replace child template div tags with script tags to avoid form submission of templates
     $parsed_template = $(template_html)
-    $child_templates = $parsed_template.closestChild('.form_template')
-    $child_templates.each () ->
-      $child = $(this)
-      $child.replaceWith($("<script id='#{$child.attr('id')}' type='text/html' />").html($child.html()))
 
     if target?
       $('#' + target).append($parsed_template)
diff --git a/lib/nested_form_fields.rb b/lib/nested_form_fields.rb
index 8883711..92e1cd5 100644
--- a/lib/nested_form_fields.rb
+++ b/lib/nested_form_fields.rb
@@ -87,24 +87,12 @@ def fields_for_has_many_association_with_template(association_name, association,
 
 
     def nested_model_template name, association_name, options, block
-      for_template = self.options[:for_template]
-
-      # Render the outermost template in a script tag to avoid it from being submited with the form
-      # Render all deeper nested templates as hidden divs as nesting script tags messes up the html.
-      # When nested fields are added with javascript by using a template that contains nested templates,
-      # the outermost nested templates div's are replaced by script tags to prevent those nested templates
-      # fields from form subission.
-      #
-      @template.content_tag( for_template ? :div : :script,
-                             type: for_template ? nil : 'text/html',
-                             id: template_id(association_name),
-                             class: for_template ? 'form_template' : nil,
-                             style: for_template ? 'display:none' : nil ) do
+      @template.content_tag( :template, id: template_id(association_name)) do
         nested_fields_wrapper(association_name, options[:wrapper_tag], options[:legend], options[:wrapper_options]) do
           association_class = (options[:class_name] || object.public_send(association_name).klass.name).to_s.classify.constantize
           fields_for_nested_model("#{name}[#{index_placeholder(association_name)}]",
                                    association_class.new,
-                                   options.merge(for_template: true), block)
+                                   options, block)
         end
       end
     end