--- cryptroot	2013-11-21 10:33:58.767495517 +0100
+++ /usr/share/initramfs-tools/scripts/local-top/cryptroot	2013-09-28 13:08:33.000000000 +0200
@@ -16,32 +16,6 @@
 	done
 }
 
-
-# Uses a timout of 5,6,7 seconds to kill the password-input
-# if you change the number of password-retries in /etc/default/
-# this function may be reduced to 2 lines (untested)
-# RB 2013/11/21 10:19
-killpass()
-{
-	sleep 5
-	echo Timeout - 5 KILLING plymouth - step 1
-	 echo killing: `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	 kill `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	echo KILLING plymouth - done
-
-	sleep 6
-	echo Timeout 2 - KILLING plymouth - step 2
-	 echo killing: `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	 kill `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	echo KILLING plymouth - done
-
-	sleep 7
-	echo Timeout 3 - KILLING plymouth - step 3
-	 echo killing: `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	 kill `ps |grep "plymouth ask-for-password "|grep -v grep|awk '{print $1}'`
-	echo KILLING plymouth - done
-}
-
 case $1 in
 prereqs)
 	prereqs
@@ -294,11 +268,9 @@
 		fi
 
 		if [ -z "$cryptkeyscript" ]; then
-			killpass 1 &
-			echo DEBUG2
-			cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter the passphrase: "
+			cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter passphrase: "
 			if [ -x /bin/plymouth ] && plymouth --ping; then
-				cryptkeyscript="plymouth ask-for-password --timeout=5 --prompt"
+				cryptkeyscript="plymouth ask-for-password --prompt"
 				cryptkey=$(printf "$cryptkey")
 			else
 				cryptkeyscript="/lib/cryptsetup/askpass"