diff -Nru at-spi2-core-2.2.2/debian/90qt-a11y at-spi2-core-2.2.2/debian/90qt-a11y
--- at-spi2-core-2.2.2/debian/90qt-a11y	2011-09-05 07:13:30.000000000 +0200
+++ at-spi2-core-2.2.2/debian/90qt-a11y	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-# -*- sh -*-
-# Xsession.d script to set the QT_ACCESSIBILITY env variable when accessibility
-# is enabled.
-#
-# This file is sourced by Xsession(5), not executed.
-
-if [ -x "/usr/bin/gsettings" ]; then
-	a11y_enabled=$(gsettings get org.gnome.desktop.interface toolkit-accessibility)
-	if "$a11y_enabled" = "true" ]; then
-		export QT_ACCESSIBILITY=1
-	fi
-fi
diff -Nru at-spi2-core-2.2.2/debian/at-spi2-core.install at-spi2-core-2.2.2/debian/at-spi2-core.install
--- at-spi2-core-2.2.2/debian/at-spi2-core.install	2011-09-05 08:03:28.000000000 +0200
+++ at-spi2-core-2.2.2/debian/at-spi2-core.install	2011-11-24 11:41:12.000000000 +0100
@@ -1,4 +1,3 @@
 etc
 usr/lib/at-spi2-core
 usr/share/dbus-1
-debian/90qt-a11y etc/X11/Xsession.d
diff -Nru at-spi2-core-2.2.2/debian/at-spi2-core.postinst at-spi2-core-2.2.2/debian/at-spi2-core.postinst
--- at-spi2-core-2.2.2/debian/at-spi2-core.postinst	1970-01-01 01:00:00.000000000 +0100
+++ at-spi2-core-2.2.2/debian/at-spi2-core.postinst	2012-01-24 12:33:14.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+    dpkg-maintscript-helper rm_conffile /etc/X11/Xsession.d/90qt-a11y 2.2.2-0ubuntu1.1 -- "$@"
+fi
+
+#DEBHELPER#
+exit 0
+
diff -Nru at-spi2-core-2.2.2/debian/at-spi2-core.postrm at-spi2-core-2.2.2/debian/at-spi2-core.postrm
--- at-spi2-core-2.2.2/debian/at-spi2-core.postrm	1970-01-01 01:00:00.000000000 +0100
+++ at-spi2-core-2.2.2/debian/at-spi2-core.postrm	2012-01-24 12:33:06.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+    dpkg-maintscript-helper rm_conffile /etc/X11/Xsession.d/90qt-a11y 2.2.2-0ubuntu1.1 -- "$@"
+fi
+
+#DEBHELPER#
+exit 0
+
diff -Nru at-spi2-core-2.2.2/debian/at-spi2-core.preinst at-spi2-core-2.2.2/debian/at-spi2-core.preinst
--- at-spi2-core-2.2.2/debian/at-spi2-core.preinst	1970-01-01 01:00:00.000000000 +0100
+++ at-spi2-core-2.2.2/debian/at-spi2-core.preinst	2012-01-24 12:33:20.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+    dpkg-maintscript-helper rm_conffile /etc/X11/Xsession.d/90qt-a11y 2.2.2-0ubuntu1.1 -- "$@"
+fi
+
+#DEBHELPER#
+exit 0
+
diff -Nru at-spi2-core-2.2.2/debian/changelog at-spi2-core-2.2.2/debian/changelog
--- at-spi2-core-2.2.2/debian/changelog	2011-11-15 01:37:49.000000000 +0100
+++ at-spi2-core-2.2.2/debian/changelog	2012-01-24 12:37:33.000000000 +0100
@@ -1,3 +1,18 @@
+at-spi2-core (2.2.2-0ubuntu1.2) oneiric; urgency=low
+
+  * Actually remove 90qt-a11y if it is already installed.
+
+ -- Aurélien Gâteau <aurelien.gateau@ubuntu.com>  Tue, 24 Jan 2012 12:34:05 +0100
+
+at-spi2-core (2.2.2-0ubuntu1.1) oneiric; urgency=low
+
+  * Remove 90qt-a11y: Qt accessibility is not stable enough in Oneiric to be
+    enabled by default for all applications. A patch for unity-2d specifically
+    enables accessibility for it so that the desktop remains accessible.
+    (LP: #877358)
+
+ -- Aurélien Gâteau <aurelien.gateau@ubuntu.com>  Thu, 24 Nov 2011 11:41:28 +0100
+
 at-spi2-core (2.2.2-0ubuntu1) oneiric-proposed; urgency=low
 
   * New upstream release (LP: #890491)
diff -Nru at-spi2-core-2.2.2/debian/control at-spi2-core-2.2.2/debian/control
--- at-spi2-core-2.2.2/debian/control	2011-11-15 00:43:42.000000000 +0100
+++ at-spi2-core-2.2.2/debian/control	2011-11-24 11:41:12.000000000 +0100
@@ -19,6 +19,7 @@
 
 Package: at-spi2-core
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Assistive Technology Service Provider Interface (dbus core)
  This package contains the core components of GNOME Accessibility.