diff --git a/debian/changelog b/debian/changelog
index e563adb6..33961537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.528) UNRELEASED; urgency=medium
+
+  * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that
+    the grub search command needs to find the right prefix/root. This is
+    different than the PARTUUID for booting initrd-less.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Mon, 28 May 2018 10:36:18 -0400
+
 livecd-rootfs (2.527) cosmic; urgency=medium
 
   * Symlink systemd-networkd-wait-online to /bin/true in the live installer
diff --git a/live-build/functions b/live-build/functions
index 3363bf2a..4441f2b1 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -296,10 +296,9 @@ replace_grub_root_with_label() {
 divert_grub() {
 	CHROOT_ROOT="$1"
 
-	chroot "$CHROOT_ROOT" dpkg-divert --local \
-		--rename /usr/sbin/grub-probe
-	chroot "$CHROOT_ROOT" touch /usr/sbin/grub-probe
-	chroot "$CHROOT_ROOT" chmod +x /usr/sbin/grub-probe
+	# Don't divert all of grub-probe here; just the scripts we don't want
+	# running. Otherwise, you may be missing part-uuids for the search
+	# command, for example. ~cyphermox
 
 	chroot "$CHROOT_ROOT" dpkg-divert --local \
 		--divert /etc/grub.d/30_os-prober.dpkg-divert \
@@ -318,10 +317,6 @@ divert_grub() {
 undivert_grub() {
 	CHROOT_ROOT="$1"
 
-	chroot "$CHROOT_ROOT" rm /usr/sbin/grub-probe
-	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
-		--rename /usr/sbin/grub-probe
-
 	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
 		--divert /etc/grub.d/30_os-prober.dpkg-divert \
 		--rename /etc/grub.d/30_os-prober