--- scripts/casper-bottom/10adduser.orig	2010-01-05 12:35:43.094700231 +1100
+++ scripts/casper-bottom/10adduser	2010-01-05 12:37:00.054698498 +1100
@@ -52,9 +52,6 @@ if [ -f /root/etc/sudoers ]; then
     fi
 fi
 
-# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
 RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null)" || RELEASE=""
 for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
     if [ -f "/root/$file" ]; then

--- scripts/casper-bottom/22gnome_panel_data.orig	2010-01-05 12:37:21.714699159 +1100
+++ scripts/casper-bottom/22gnome_panel_data	2010-01-05 12:40:59.654699161 +1100
@@ -26,9 +26,4 @@ if [ -x /root/usr/sbin/laptop-detect ]; 
 	fi
 fi
 
-panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
-if [ -n "$panel_version" ]; then
-    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
-fi
-
 log_end_msg