diff --git a/Makefile.in b/Makefile.in
index 21dcfe18c591..e99707abb2d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -240,11 +240,6 @@ default::
 	@echo "===SCCACHE STATS==="
 	-$(CCACHE) --show-stats
 	@echo "==================="
-ifndef MOZ_PROFILE_GENERATE
-# Ideally we'd do that in the same file as we set the sccache.log location for
-# sccache, but it's too late in the build.
-	-gzip -9 $(DIST)/sccache.log
-endif
 endif
 
 distclean::
diff --git a/build/mozconfig.cache b/build/mozconfig.cache
index 8931d976279c..3111e1c70014 100644
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -75,7 +75,6 @@ if test -n "$bucket"; then
     export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1
     mk_add_options MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache2/sccache
-    mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
     case "$platform" in
     win*)
         # For now, sccache doesn't support separate PDBs so force debug info to be
diff --git a/client.mk b/client.mk
index 9b6571cd3f90..f8b0986ca55c 100644
--- a/client.mk
+++ b/client.mk
@@ -82,7 +82,8 @@ build::
 	# Start a new server, ensuring it gets the jobserver file descriptors
 	# from make (but don't use the + prefix when make -n is used, so that
 	# the command doesn't run in that case)
-	$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache::compiler=debug SCCACHE_ERROR_LOG=$(OBJDIR)/dist/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
+	mkdir -p $(UPLOAD_PATH)
+	$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache=debug SCCACHE_ERROR_LOG=$(UPLOAD_PATH)/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
 endif
 
 ####################################