diff --git a/data/export/supervisord/app.conf.erb b/data/export/supervisord/app.conf.erb
index 9acb875..06e17a8 100644
--- a/data/export/supervisord/app.conf.erb
+++ b/data/export/supervisord/app.conf.erb
@@ -5,7 +5,7 @@ engine.procfile.entries.each do |process|
   1.upto(self.concurrency[process.name]) do |num|
     port = engine.port_for(process, num, self.port)
     name = if (conc > 1); "#{process.name}-#{num}" else process.name; end
-    environment = (engine.environment.map{ |var,env| "#{var.upcase}=#{wrap_environment env}" } + ["PORT=#{wrap_environment port}"])
+    environment = (engine.environment.map{ |var,env| %{#{var.upcase}="#{env}"} } + [%{PORT="#{port}"}])
     app_name = "#{app}-#{name}"
     app_names << app_name
 %>
@@ -24,4 +24,4 @@ end
 %>
 
 [group:<%= app %>]
-programs=<%= app_names.join(',') %>
\ No newline at end of file
+programs=<%= app_names.join(',') %>
diff --git a/lib/foreman/export/supervisord.rb b/lib/foreman/export/supervisord.rb
index aef2097..11eedd6 100644
--- a/lib/foreman/export/supervisord.rb
+++ b/lib/foreman/export/supervisord.rb
@@ -23,8 +23,4 @@ class Foreman::Export::Supervisord < Foreman::Export::Base
     write_file "#{location}/#{app}.conf", app_config
   end
 
-  def wrap_environment env
-    "\"#{env}\""
-  end
-
 end
diff --git a/spec/foreman/export/supervisord_spec.rb b/spec/foreman/export/supervisord_spec.rb
index 9ef9ef1..2a65991 100644
--- a/spec/foreman/export/supervisord_spec.rb
+++ b/spec/foreman/export/supervisord_spec.rb
@@ -15,12 +15,11 @@ describe Foreman::Export::Supervisord, :fakefs do
   it "exports to the filesystem" do
     supervisord.export
 
-    File.read("/tmp/init/app.conf").should         == example_export_file("supervisord/app.conf")
+    File.read("/tmp/init/app.conf").should == example_export_file("supervisord/app.conf")
   end
 
   it "cleans up if exporting into an existing dir" do
     mock(FileUtils).rm("/tmp/init/app.conf")
-
     supervisord.export
     supervisord.export
   end
@@ -30,8 +29,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "exports to the filesystem with concurrency" do
       supervisord.export
-
-      File.read("/tmp/init/app.conf").should            == example_export_file("supervisord/app-alpha-2.conf")
+      File.read("/tmp/init/app.conf").should == example_export_file("supervisord/app-alpha-2.conf")
     end
   end
 
@@ -46,7 +44,6 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "can export with alternate template files" do
       supervisord.export
-
       File.read("/tmp/init/app.conf").should == "alternate_template\n"
     end
   end
@@ -67,16 +64,11 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "can export with alternate template files" do
       supervisord.export
-
       File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
     end
   end
 
   context "environment export" do
-    it "wraps the original environment with quotes" do
-      supervisord.wrap_environment("slowqueue,fastqueue").should == '"slowqueue,fastqueue"'
-    end
-
     it "correctly translates environment when exporting" do
       File.open("/tmp/supervisord_env", "w") { |f| f.puts("QUEUE=fastqueue,slowqueue\nVERBOSE=1") }