diff --git a/ChangeLog b/ChangeLog
index f28519489..e3ab853dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-19  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in (prepare_grub_to_access_device): Remove
+	check for partition that provides /boot/grub.  Its logic is flawed,
+	as it prevents prepare_grub_to_access_device() from being called
+	multiple times.
+
 2008-06-19  Robert Millan  <rmh@aybabtu.com>
 
 	* util/update-grub_lib.in (prepare_grub_to_access_device): Issue
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index b7d141e4e..ed4029a61 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -114,12 +114,6 @@ prepare_grub_to_access_device ()
 {
   device=$1
 
-  # If our target is the same partition that provides /boot/grub, our $root
-  # is already set to what we want, so no need to bother with UUIDs.
-  if [ "x${device}" = "x`${grub_probe} --target=device /boot/grub`" ] ; then
-    return
-  fi
-
   # Abstraction modules aren't auto-loaded.
   abstraction="`${grub_probe} --device ${device} --target=abstraction`"
   if [ "x${abstraction}" = "x" ] ; then : ; else