diff --git a/debian/changelog b/debian/changelog
index 5877082d..e56bf7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.40) oneiric; urgency=low
+
+  * Revert the previous change and apply it for all $PREINSTALLED
+    targets instead of just ext2|ext3|ext4, so ac100 gets the fix.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 28 Sep 2011 15:20:38 -0600
+
 livecd-rootfs (2.39) oneiric; urgency=low
 
   * Explicitely select the oem-config frontend to install on a
diff --git a/live-build/auto/config b/live-build/auto/config
index d5d37c98..5b3d1717 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -77,17 +77,7 @@ case $IMAGEFORMAT in
 				COMPONENTS='main restricted universe multiverse'
 				;;
 			*)
-				case $PROJECT in
-					kubuntu*)
-						add_package live jasper oem-config-kde
-						;;
-					ubuntu-server)
-						add_package live jasper oem-config-debconf
-						;;
-					*)
-						add_package live jasper oem-config-gtk
-						;;
-				esac
+				add_package live jasper
 				;;
 		esac
 		;;
@@ -102,6 +92,22 @@ case $IMAGEFORMAT in
 		;;
 esac
 
+if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
+	case $PROJECT in
+		kubuntu*)
+			add_package live oem-config-kde
+			;;
+		ubuntu-server)
+			add_package live oem-config-debconf
+			;;
+		ubuntu-core|base)
+			;;
+		*)
+			add_package live oem-config-gtk
+			;;
+	esac
+fi
+
 case $BINARYFORMAT in
 	iso*|usb*)
 		BINARY_IMAGES="$BINARYFORMAT"