diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r21.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r22.ebuild
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r21.ebuild
rename to project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1-r22.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
index 4c4c3bc..3744870 100644
--- a/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd/chromeos-init-systemd-0.0.1.ebuild
@@ -65,8 +65,6 @@
 	insinto "$(systemd_get_unitdir)/update-engine.service.d"
 	newins "${FILESDIR}"/update-engine-secure-boot.conf secure-boot.conf
 
-	# Upstream crash-sender.service has a random delay up to 6 minutes.
-	# The drop-in file forces immediate uploading by setting max_spread_time=0.
 	insinto "$(systemd_get_unitdir)/crash-sender.service.d"
 	newins "${FILESDIR}"/crash-sender-send-immediately.conf send-immediately.conf
 
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf b/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
index 3ba8177..6e4805a 100644
--- a/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd/files/crash-sender-send-immediately.conf
@@ -2,5 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 [Service]
+# Clear existing ExecStart specified in ChromiumOS crash-sender.service.
+# See also:
+# https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/master/crash-reporter/init/crash-sender.service#7
+# https://www.freedesktop.org/software/systemd/man/systemd.unit.html#:~:text=remove%20entries%20from%20a%20setting
 ExecStart=
-ExecStart=/sbin/crash_sender --max_spread_time=0
+# Upstream crash-sender.service has a random delay up to 6 minutes.
+# The drop-in file forces immediate uploading by setting max_spread_time=1.
+# Do not set to 0 because it would trigger UMA metric sending, but COS does
+# not have metrics daemon installed.
+ExecStart=/sbin/crash_sender --max_spread_time=1