Merge pull request #4880 from kylog/pup-6160/revert-pup-5737

Revert "(PUP-5737) Backport test fix from a pe-puppet fork"

acceptance/setup/common/pre-suite/100_SetParser.rb

@@ -11,18 +11,7 @@
       # otherwise the setting is created outside of any section
       # which makes it appear future parser is not enabled.
       puppet_conf = host.puppet['config']
-      on(host, "grep '[main]' #{puppet_conf}", :acceptable_exit_codes => [0,1,2]) do |result|
-        case result.exit_code
-        when 0
-          # there is an assumption here that if a [main] section is present, it
-          # has settings otherwise PUP-4755 comes back into play, though
-          # 'global' settings should still end up in main when Puppet parses
-          on(host, puppet("config set --section main parser #{parser}"))
-        else
-          # not found (1), or file not present (2)
-          on(host, "echo \"[main]\nparser=future\n\" >> '#{puppet_conf}'")
-        end
-      end
+      on(host, "echo \"[main]\nparser=future\n\" >> '#{puppet_conf}'")
     end
   end
 end