diff --git a/Gemfile.lock b/Gemfile.lock
index eddc27ee84..864870b280 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
-    newrelic_rpm (3.6.7.152)
+    newrelic_rpm (3.12.0.288)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oj (2.1.2)
diff --git a/config/unicorn.rb b/config/unicorn.rb
index e5d7317940..22e954b4d0 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -1,27 +1,2 @@
-preload_app true   # https://newrelic.com/docs/ruby/no-data-with-unicorn
-worker_processes 4 # amount of unicorn workers to spin up
-timeout 60         # restarts workers that hang for 30 seconds
-
-
-# https://devcenter.heroku.com/articles/forked-pg-connections
-before_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-
-end
+worker_processes 2 # amount of unicorn workers to spin up
+timeout 120         # restarts workers that hang for 30 seconds