diff --git a/lib/java_buildpack/util/configuration_utils.rb b/lib/java_buildpack/util/configuration_utils.rb
index 195cb01876..289d199cd6 100644
--- a/lib/java_buildpack/util/configuration_utils.rb
+++ b/lib/java_buildpack/util/configuration_utils.rb
@@ -65,8 +65,6 @@ def write(identifier, new_content, should_log = true)
 
             File.open(file, 'w') do |f|
               header.each { |line| f.write line }
-              # f.write(header.join('\n'))
-              # f.write('\n')
               YAML.dump(new_content, f)
             end
           else
diff --git a/spec/java_buildpack/util/configuration_utils_spec.rb b/spec/java_buildpack/util/configuration_utils_spec.rb
index 68afb8eac8..5b10b80312 100644
--- a/spec/java_buildpack/util/configuration_utils_spec.rb
+++ b/spec/java_buildpack/util/configuration_utils_spec.rb
@@ -105,6 +105,7 @@ def file_contents(file)
     header = []
     File.open(file, 'r') do |f|
       f.each do |line|
+        break if line =~ /^---/
         header << line
       end
     end