diff --git a/.travis.yml b/.travis.yml
index ba7b0b9b5..10f0115d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 cache: bundler
-bundler_args: '--without production development'
+bundler_args: '--without development'
 env: DATABASE_URL=postgres://postgres@localhost/timeoverflow_test
 before_script:
   - bundle exec rake db:setup
diff --git a/Gemfile b/Gemfile
index 361440368..4e65f69ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,3 @@ group :test do
   gem 'chromedriver-helper', '~> 2.1'
   gem 'simplecov', '~> 0.16.1', require: false
 end
-
-group :production do
-  gem 'rails_12factor', '0.0.3'
-end
diff --git a/Gemfile.lock b/Gemfile.lock
index 20335b45e..0b4061bdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,11 +266,6 @@ GEM
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.3)
-    rails_stdout_logging (0.0.3)
     railties (4.2.11)
       actionpack (= 4.2.11)
       activesupport (= 4.2.11)
@@ -435,7 +430,6 @@ DEPENDENCIES
   pundit (~> 2.0.0)
   rails (~> 4.2)
   rails-i18n
-  rails_12factor (= 0.0.3)
   rdiscount
   rollbar (= 2.8.3)
   rspec-rails (~> 3.8.2)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index fe4480f76..63287d136 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,7 +22,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.serve_static_files = true
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index b451781fe..1ba241c29 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -22,7 +22,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.serve_static_files = true
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier