diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index e38c82e0a90fe74425ed5d2013503f028480cc58..910431c07a768dc8135e4fa599ffdd067b49b069 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -975,22 +975,10 @@
   Settings.repositories.storages[key] = Gitlab::GitalyClient::StorageSettings.new(storage)
 end
 
-#
-# The repository_downloads_path is used to remove outdated repository
-# archives, if someone has it configured incorrectly, and it points
-# to the path where repositories are stored this can cause some
-# data-integrity issue. In this case, we sets it to the default
-# repository_downloads_path value.
-#
-repositories_storages          = Settings.repositories.storages.values
-repository_downloads_path      = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '')
-repository_downloads_full_path = File.expand_path(repository_downloads_path, Settings.gitlab['user_home'])
+repository_downloads_path = Settings.gitlab['repository_downloads_path'].to_s.gsub(%r{/$}, '')
 
-# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1255
-Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-  if repository_downloads_path.blank? || repositories_storages.any? { |rs| [repository_downloads_path, repository_downloads_full_path].include?(rs.legacy_disk_path.gsub(%r{/$}, '')) }
-    Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
-  end
+if repository_downloads_path.blank?
+  Settings.gitlab['repository_downloads_path'] = File.join(Settings.shared['path'], 'cache/archive')
 end
 
 #