diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 237a27bfc..db074c924 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -140,7 +140,6 @@ class ApplicationController < ActionController::Base
     CurrentUser.user = nil
     CurrentUser.ip_addr = nil
     CurrentUser.safe_mode = false
-    CurrentUser.root_url = root_url.chomp("/")
   end
 
   # Skip setting the session cookie if the response is being publicly cached to
diff --git a/app/logical/current_user.rb b/app/logical/current_user.rb
index f66439dbb..c6186b6d8 100644
--- a/app/logical/current_user.rb
+++ b/app/logical/current_user.rb
@@ -1,5 +1,5 @@
 class CurrentUser < ActiveSupport::CurrentAttributes
-  attribute :user, :ip_addr, :country, :root_url, :safe_mode
+  attribute :user, :ip_addr, :country, :safe_mode
 
   alias_method :safe_mode?, :safe_mode
   delegate :id, to: :user, allow_nil: true
@@ -20,8 +20,4 @@ class CurrentUser < ActiveSupport::CurrentAttributes
 
     scoped(user, &block)
   end
-
-  def self.root_url
-    attributes[:root_url] || "https://#{Danbooru.config.hostname}"
-  end
 end
diff --git a/app/logical/storage_manager.rb b/app/logical/storage_manager.rb
index 991ac7cf9..80ed17010 100644
--- a/app/logical/storage_manager.rb
+++ b/app/logical/storage_manager.rb
@@ -1,11 +1,9 @@
 class StorageManager
   class Error < StandardError; end
 
-  DEFAULT_BASE_DIR = "#{Rails.root}/public/data"
-
   attr_reader :base_url, :base_dir, :hierarchical, :tagged_filenames, :original_subdir
 
-  def initialize(base_url: default_base_url, base_dir: DEFAULT_BASE_DIR, hierarchical: false, tagged_filenames: Danbooru.config.enable_seo_post_urls, original_subdir: "")
+  def initialize(base_url:, base_dir:, hierarchical: false, tagged_filenames: Danbooru.config.enable_seo_post_urls, original_subdir: "")
     @base_url = base_url.chomp("/")
     @base_dir = base_dir
     @hierarchical = hierarchical
@@ -13,10 +11,6 @@ class StorageManager
     @original_subdir = original_subdir
   end
 
-  def default_base_url
-    "#{CurrentUser.root_url}/data"
-  end
-
   # Store the given file at the given path. If a file already exists at that
   # location it should be overwritten atomically. Either the file is fully
   # written, or an error is raised and the original file is left unchanged. The
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index f8204caf1..4d2011943 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -28,14 +28,17 @@ module Danbooru
       Socket.gethostname
     end
 
-    # The canonical url for the site (e.g. https://danbooru.donmai.us)
+    # The canonical root url for the site (e.g. https://danbooru.donmai.us).
+    # Images will be served from this URL by default. Change this to http:// if
+    # you don't support HTTPS. Protip: use ngrok.com for easy HTTPS support
+    # during development.
     def canonical_url
-      "https://#{hostname}"
+      "https://#{Danborou.config.hostname}"
     end
 
     # Contact email address of the admin.
     def contact_email
-      "webmaster@#{hostname}"
+      "webmaster@#{Danbooru.config.hostname}"
     end
 
     # System actions, such as sending automated dmails, will be performed with
@@ -148,10 +151,10 @@ module Danbooru
     def storage_manager
       # Store files on the local filesystem.
       # base_dir - where to store files (default: under public/data)
-      # base_url - where to serve files from (default: http://#{hostname}/data)
+      # base_url - where to serve files from (default: https://#{hostname}/data)
       # hierarchical: false - store files in a single directory
       # hierarchical: true - store files in a hierarchical directory structure, based on the MD5 hash
-      StorageManager::Local.new(base_url: "#{CurrentUser.root_url}/data", base_dir: Rails.root.join("public/data"), hierarchical: false)
+      StorageManager::Local.new(base_url: "#{Danbooru.config.canonical_url}/data", base_dir: Rails.root.join("public/data"), hierarchical: false)
 
       # Store files on one or more remote host(s). Configure SSH settings in
       # ~/.ssh_config or in the ssh_options param (ref: http://net-ssh.github.io/net-ssh/Net/SSH.html#method-c-start)