diff --git a/roles/matrix-dendrite/tasks/init.yml b/roles/matrix-dendrite/tasks/init.yml
index 28709469e..2e2e551a8 100644
--- a/roles/matrix-dendrite/tasks/init.yml
+++ b/roles/matrix-dendrite/tasks/init.yml
@@ -1,7 +1,3 @@
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dendrite.service'] }}"
   when: matrix_dendrite_enabled|bool
-
-- set_fact:
-    matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-goofys.service'] }}"
-  when: matrix_s3_media_store_enabled|bool
diff --git a/roles/matrix-dendrite/tasks/setup_dendrite.yml b/roles/matrix-dendrite/tasks/setup_dendrite.yml
index 9fa8f5664..04c3a7fef 100644
--- a/roles/matrix-dendrite/tasks/setup_dendrite.yml
+++ b/roles/matrix-dendrite/tasks/setup_dendrite.yml
@@ -9,9 +9,6 @@
   with_items:
     - { path: "{{ matrix_dendrite_config_dir_path }}", when: true }
     - { path: "{{ matrix_dendrite_ext_path }}", when: true }
-    # We handle matrix_dendrite_media_store_path elsewhere (in ./dendrite/setup_install.yml),
-    # because if it's using Goofys and it's already mounted (from before),
-    # trying to chown/chmod it here will cause trouble.
-  when: "(matrix_dendrite_enabled|bool or matrix_s3_media_store_enabled|bool) and item.when"
+  when: "matrix_dendrite_enabled|bool and item.when"
 
 - import_tasks: "{{ role_path }}/tasks/dendrite/setup.yml"
diff --git a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
index 48067c0e3..647d07564 100644
--- a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
+++ b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
@@ -15,12 +15,6 @@ Type=simple
 Environment="HOME={{ matrix_systemd_unit_home_path }}"
 ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-dendrite
 ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-dendrite
-{% if matrix_s3_media_store_enabled %}
-# Allow for some time before starting, so that media store can mount.
-# Mounting can happen later too, but if we start writing,
-# we'd write files to the local filesystem and fusermount will complain.
-ExecStartPre={{ matrix_host_command_sleep }} 3
-{% endif %}
 
 ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
 			--log-driver=none \