diff -Nru vim-7.3.429/debian/changelog vim-7.3.429/debian/changelog
--- vim-7.3.429/debian/changelog	2012-02-27 21:40:33.000000000 +0100
+++ vim-7.3.429/debian/changelog	2012-03-11 14:35:41.000000000 +0100
@@ -1,3 +1,11 @@
+vim (2:7.3.429-2ubuntu2) precise; urgency=low
+
+  * debian/runtime/vimrc, debian/runtime/gvimrc:
+    Undo the changes from the previous upload as they conflict with/override
+    user settings from ~/.vimrc (lp: #951440; re-open #871907).
+
+ -- Michael Bienia <geser@ubuntu.com>  Sun, 11 Mar 2012 14:30:55 +0100
+
 vim (2:7.3.429-2ubuntu1) precise; urgency=low
 
   * Merge with Debian testing/unstable (lp: #927642). Remaining changes: 
diff -Nru vim-7.3.429/debian/runtime/gvimrc vim-7.3.429/debian/runtime/gvimrc
--- vim-7.3.429/debian/runtime/gvimrc	2012-02-27 10:15:09.000000000 +0100
+++ vim-7.3.429/debian/runtime/gvimrc	2012-03-11 14:30:07.000000000 +0100
@@ -1,6 +1,3 @@
-" Unset the dark background from vimrc
-set background=light
-
 " Make external commands work through a pipe instead of a pseudo-tty
 "set noguipty
 
diff -Nru vim-7.3.429/debian/runtime/vimrc vim-7.3.429/debian/runtime/vimrc
--- vim-7.3.429/debian/runtime/vimrc	2012-02-27 10:15:09.000000000 +0100
+++ vim-7.3.429/debian/runtime/vimrc	2012-03-11 14:30:43.000000000 +0100
@@ -23,7 +23,7 @@
 
 " If using a dark background within the editing area and syntax highlighting
 " turn on this option as well
-set background=dark
+"set background=dark
 
 " Uncomment the following to have Vim jump to the last position when
 " reopening a file