diff -u bash-completion-1.1/debian/changelog bash-completion-1.1/debian/changelog
--- bash-completion-1.1/debian/changelog
+++ bash-completion-1.1/debian/changelog
@@ -1,3 +1,12 @@
+bash-completion (1:1.1-3ubuntu4) maverick; urgency=low
+
+  * Revert 1:1.1-3ubuntu3.  The patch was clearly untested as it leads to
+    syntax errors when starting every shell.  Even after fixing the syntax
+    errors, it resulted in undesirable tab completions that could not be
+    reversed using Backspace.  (LP: #546794)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Thu, 27 May 2010 15:55:30 -0400
+
 bash-completion (1:1.1-3ubuntu3) maverick; urgency=low
 
   * Try searching for lib$package on apt-get completion.  With this
diff -u bash-completion-1.1/debian/patches/series bash-completion-1.1/debian/patches/series
--- bash-completion-1.1/debian/patches/series
+++ bash-completion-1.1/debian/patches/series
@@ -1,7 +1,6 @@
 01-fix_550943.patch
 02-fix_552109.patch
 03-fix_552631.patch
-04-fix-546794.patch
 bash-completion-wget-o-fix
 fix-multiple-known_hosts
 disable-avahi-browse.diff
reverted:
--- bash-completion-1.1/debian/patches/04-fix-546794.patch
+++ bash-completion-1.1.orig/debian/patches/04-fix-546794.patch
@@ -1,14 +0,0 @@
-Index: bash-completion-1.1/contrib/apt
-===================================================================
---- bash-completion-1.1.orig/contrib/apt	2010-03-25 12:19:07.277875468 +0000
-+++ bash-completion-1.1/contrib/apt	2010-03-25 12:20:07.720388064 +0000
-@@ -29,7 +29,8 @@
-                 ;;
-             *)
-                 COMPREPLY=( $( apt-cache --no-generate pkgnames "$cur" \
--                    2> /dev/null ) )
-+                    2> /dev/null ); $( apt-cache --no-generate pkgnames "lib$cur" \
-+                    2> /dev/null); )
-                 return 0
-                 ;;
-         esac