diff -u sssd-1.8.6/debian/changelog sssd-1.8.6/debian/changelog
--- sssd-1.8.6/debian/changelog
+++ sssd-1.8.6/debian/changelog
@@ -1,3 +1,11 @@
+sssd (1.8.6-0ubuntu0.3) precise-proposed; urgency=low
+
+  * Revert the pam password stack change, there's no way to fix it
+    properly for every use case without adding new dependencies.
+    (LP: #1159983)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 13 Sep 2013 11:36:12 +0300
+
 sssd (1.8.6-0ubuntu0.2) precise-proposed; urgency=low
 
   * rules: Really install the new pam-auth-update file for password
reverted:
--- sssd-1.8.6/debian/libpam-sss.pam-auth-update-password
+++ sssd-1.8.6.orig/debian/libpam-sss.pam-auth-update-password
@@ -1,9 +0,0 @@
-Name: SSS password change
-Default: yes
-Priority: 512
-
-Password-Type: Primary
-Password:
-	sufficient					pam_sss.so use_authtok
-Password-Initial:
-	sufficient					pam_sss.so
diff -u sssd-1.8.6/debian/rules sssd-1.8.6/debian/rules
--- sssd-1.8.6/debian/rules
+++ sssd-1.8.6/debian/rules
@@ -32,8 +32,6 @@
 	mkdir -p $(CURDIR)/debian/libpam-sss/usr/share/pam-configs
 	install -m644 debian/libpam-sss.pam-auth-update \
 		$(CURDIR)/debian/libpam-sss/usr/share/pam-configs/sss
-	install -m644 debian/libpam-sss.pam-auth-update-password \
-		$(CURDIR)/debian/libpam-sss/usr/share/pam-configs/sss-password
 
 	cat $(CURDIR)/debian/sssd.$(INIT).in > $(CURDIR)/debian/sssd.$(INIT)
 
diff -u sssd-1.8.6/debian/libpam-sss.pam-auth-update sssd-1.8.6/debian/libpam-sss.pam-auth-update
--- sssd-1.8.6/debian/libpam-sss.pam-auth-update
+++ sssd-1.8.6/debian/libpam-sss.pam-auth-update
@@ -11,6 +11,11 @@
 Account:
 	sufficient					pam_localuser.so
 	[default=bad success=ok user_unknown=ignore]	pam_sss.so
+Password-Type: Primary
+Password:
+	sufficient					pam_sss.so
+Password-Initial:
+	sufficient					pam_sss.so
 Session-Type: Additional
 Session-Interactive-Only: yes
 Session:
diff -u sssd-1.8.6/debian/control sssd-1.8.6/debian/control
--- sssd-1.8.6/debian/control
+++ sssd-1.8.6/debian/control
@@ -1,7 +1,7 @@
 Source: sssd
 Section: utils
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton@ubuntu.com>
 Build-Depends: debhelper (>= 9), quilt, dh-autoreconf, autopoint, lsb-release,