* removing helper to resolve remote_ip, and doing it the 'rails' way

web/app/controllers/users_controller.rb

@@ -31,7 +31,7 @@ class UsersController < ApplicationController
     end
     @signup_postback = load_postback(@invited_user)
 
-    load_location(remote_ip())
+    load_location(request.remote_ip)
 
     @user = User.new
     @user.musician = true # default the UI to musician as selected option

web/app/helpers/application_helper.rb

@@ -18,12 +18,4 @@ module ApplicationHelper
     Rails.application.config.bugsnag_notify_release_stages.include? Rails.env
   end
 
-  def remote_ip
-    if Rails.application.config.proxy_use_x_real_ip
-      request.env['X-Real-IP']
-    else
-      request.remote_ip
-    end
-  end
-
 end

web/config/application.rb

@@ -154,7 +154,5 @@ if defined?(Bundler)
 
     config.ga_ua = 'UA-44184562-2' # google analytics
     config.ga_suppress_admin = true
-
-    config.proxy_use_x_real_ip = false
   end
 end