diff --git a/templates/nginx/galaxy.j2 b/templates/nginx/galaxy.j2
index f3a7d0b41..af26970ab 100644
--- a/templates/nginx/galaxy.j2
+++ b/templates/nginx/galaxy.j2
@@ -140,31 +140,6 @@ server {
         proxy_pass http://localhost:{{ galaxy_tusd_port }}/files;
     }
 
-{% if galaxy_config['galaxy']['nginx_upload_store'] is defined %}
-
-    location /_upload {
-        upload_store {{ galaxy_config['galaxy']['nginx_upload_store'] }};
-        upload_limit_rate "{{ nginx_upload_limit_rate|d(0) }}";
-        upload_store_access user:rw group:r all:r;
-        upload_pass_form_field "";
-        upload_set_form_field "__${upload_field_name}__is_composite" "true";
-        upload_set_form_field "__${upload_field_name}__keys" "name path";
-        upload_set_form_field "${upload_field_name}_name" "$upload_file_name";
-        upload_set_form_field "${upload_field_name}_path" "$upload_tmp_path";
-        upload_pass_args on;
-        upload_buffer_size 4M;
-        upload_pass /_upload_done;
-    }
-
-    location /_upload_done {
-        set $dst /api/tools;
-        if ($args ~ nginx_redir=([^&]+)) {
-                set $dst $1;
-        }
-        rewrite "" $dst;
-    }
-
-{% endif %}
 {% if galaxy_config['galaxy']['nginx_upload_job_files_store'] is defined %}
 
     location /_job_files {
@@ -177,7 +152,7 @@ server {
         upload_pass_form_field "";
         upload_set_form_field "__${upload_field_name}_path" "$upload_tmp_path";
         upload_pass_args on;
-        upload_buffer_size 4M;
+        upload_buffer_size 16M;
         upload_pass /_upload_job_files_done;
     }