diff --git a/config/application.yml.example b/config/application.yml.example
index fc3ba2173..4eadcf13c 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -125,7 +125,6 @@ defaults: &defaults
   # Diaspora is only tested against this default pubsub server. You probably don't want to change this.
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
 
-  circumvent_ssl_requirement: false
   # Email
 
   # Setting this to true enables Diaspora's "send email" functionality,
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f5b8ac571..ac0a93e82 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require File.join(Rails.root, 'lib', 'enviroment_configuration')
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -40,7 +38,7 @@ Diaspora::Application.configure do
   config.serve_static_assets = false
 
   #force ssl in production
-  config.middleware.insert_before ActionDispatch::Static, "Rack::SSL" unless EnviromentConfiguration.circumvent_ssl?
+  config.middleware.insert_before ActionDispatch::Static, "Rack::SSL"
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
diff --git a/lib/enviroment_configuration.rb b/lib/enviroment_configuration.rb
index c9e741e8c..43fcd4b83 100644
--- a/lib/enviroment_configuration.rb
+++ b/lib/enviroment_configuration.rb
@@ -29,10 +29,6 @@ module EnviromentConfiguration
     end
   end
 
-  def self.circumvent_ssl?
-    ENV['NO_SSL'] || AppConfig[:circumvent_ssl_requirement].present?
-  end
-
   def self.ca_cert_file_location
     if self.heroku?
       "/usr/lib/ssl/certs/ca-certificates.crt"