Removed change to application_controller.rb in preparation for Nan's change.