--- /lib/initcpio/hooks/resume.orig	2008-12-02 23:32:22.000000000 +0100
+++ /lib/initcpio/hooks/resume	2008-11-23 07:48:21.000000000 +0100
@@ -3,25 +3,16 @@
 {
     fmtdevice () { echo "${1}:${2}"; }
 
-    swapdev="${resume}"
-    if [ -n "${resume}" ]; then
-	cryptsetup isLuks ${resume}
-	if [ $? -eq 0 ]; then
-	      cryptsetup luksOpen ${resume} swap
-	      swapdev="/dev/mapper/swap"
-	fi
-    fi
-
     # Try resuming with tuxonice
     tuxoniceroot="/sys/power/tuxonice"
     if [ -d "${tuxoniceroot}" -a -n "${resume}" ]; then
-        echo ${swapdev} > ${tuxoniceroot}/resume
+        echo ${resume} > ${tuxoniceroot}/resume
         echo > ${tuxoniceroot}/do_resume
     fi
 
     # Try resuming with vanilla hibernation
     if [ -e "/sys/power/resume" -a -n "${resume}" ]; then
-        eval $(/bin/parseblock "${swapdev}")
+        eval $(/bin/parseblock "${resume}")
         fmtdevice ${BLOCKDEVICE} > /sys/power/resume
     fi
 }