diff --git a/templates/my.cnf.erb b/templates/my.cnf.erb
index f84f45c3b..7d832d978 100644
--- a/templates/my.cnf.erb
+++ b/templates/my.cnf.erb
@@ -1,3 +1,5 @@
+### MANAGED BY PUPPET ###
+
 <% @options.sort.map do |k,v| -%>
 <%   if v.is_a?(Hash) -%>
 [<%=   k %>]
diff --git a/templates/my.conf.cnf.erb b/templates/my.conf.cnf.erb
deleted file mode 100644
index 04d297429..000000000
--- a/templates/my.conf.cnf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-### MANAGED BY PUPPET ###
-<% @settings.sort.each do |section, content|      -%>
-[<%= section %>]
-<%   content.sort.each do |key, values|          -%>
-<%     [values].flatten.sort.each do |value|     -%>
-<%= !value ? '#' : '' %><%= key -%><%=
-         case value
-         when true, false
-           ''
-         else
-           " = #{value}"
-         end
-%>
-<%     end                                       -%>
-<%   end                                         -%>
-
-<% end                                           -%>