--- grub2_debian_rules.orig	2014-04-06 23:35:16.000000000 -0400
+++ grub2_debian_rules	2014-04-07 00:29:38.000000000 -0400
@@ -59,9 +59,8 @@
 
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 DEFAULT_CMDLINE := quiet splash
-DEFAULT_TIMEOUT := 10
-DEFAULT_HIDDEN_TIMEOUT := 0
-DEFAULT_HIDDEN_TIMEOUT_BOOL := true
+DEFAULT_TIMEOUT := 0
+DEFAULT_TIMEOUT_STYLE := hidden
 confflags += \
 	--enable-ubuntu-recovery \
 	--enable-quiet-boot \
@@ -73,9 +72,8 @@
 	-Vgfxpayload-depends="grub-gfxpayload-lists [any-i386 any-amd64]"
 else ifeq (yes,$(shell dpkg-vendor --derives-from Tanglu && echo yes))
 DEFAULT_CMDLINE := quiet splash
-DEFAULT_TIMEOUT := 10
-DEFAULT_HIDDEN_TIMEOUT := 0
-DEFAULT_HIDDEN_TIMEOUT_BOOL := true
+DEFAULT_TIMEOUT := 0
+DEFAULT_TIMEOUT_STYLE := hidden
 confflags += \
 	--enable-quiet-boot \
 	--enable-quick-boot \
@@ -87,8 +85,8 @@
 else
 DEFAULT_CMDLINE := quiet
 DEFAULT_TIMEOUT := 5
-DEFAULT_HIDDEN_TIMEOUT :=
 DEFAULT_HIDDEN_TIMEOUT_BOOL := false
+DEFAULT_TIMEOUT_STYLE := 
 substvars :=
 endif
 
@@ -377,8 +375,8 @@
 		-e "s/@DEFAULT_CMDLINE@/$(DEFAULT_CMDLINE)/g" \
 		-e "s/@DEFAULT_TIMEOUT@/$(DEFAULT_TIMEOUT)/g" \
 		debian/grub2-common/usr/share/grub/default/grub
-ifneq (,$(DEFAULT_HIDDEN_TIMEOUT))
-	perl -pi -e 's/^GRUB_TIMEOUT=.*/GRUB_HIDDEN_TIMEOUT=0\nGRUB_HIDDEN_TIMEOUT_QUIET=true\n$$&/' \
+ifneq (,$(DEFAULT_TIMEOUT_STYLE))
+	perl -pi -e 's/^GRUB_TIMEOUT=.*/$$&\nGRUB_TIMEOUT_STYLE=$(DEFAULT_TIMEOUT_STYLE)/' \
 		debian/grub2-common/usr/share/grub/default/grub
 endif
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))