diff --git a/ChangeLog b/ChangeLog
index 92b7c867a..d654fd7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
-
-	* util/grub.d/00_header.in: Make timeout apply to else
-	clause of hidden timout.
-	Reported by: Mads Kiilerich.
-
 2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/fs.c (grub_fs_probe) [GRUB_UTIL]: Add workaround for
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 04db1c83f..765bfdcd3 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -280,8 +280,6 @@ make_timeout ()
 	fi
 	cat << EOF
 if sleep$verbose --interruptible ${1} ; then
-  set timeout=0
-else
   set timeout=${2}
 fi
 EOF