diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index c2fe774ecb..4b8fce82e5 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -84,9 +84,9 @@ SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so
 	libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
 	libilmimf.so $(HAIKU_SHARED_LIBSUPC++)
 ;
-SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
-	net_server media_addon_server input_server app_server fake_app_server
-	midi_server print_server mail_daemon cddb_daemon
+SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
+	media_addon_server media_server midi_server net_server print_server
+	registrar syslog_daemon
 ;
 
 SYSTEM_NETWORK_DEVICES = ethernet loopback ;
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index d55a849af4..5540020f2f 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -93,11 +93,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/net_server				# launch net_server
 fi
 
-if [ "$SAFEMODE" != "yes" ]; then
-	launch $SERVERS/app_server picasso		# launch app_server
-else
-	launch $SERVERS/fake_app_server picasso
-fi
+launch $SERVERS/app_server picasso		# launch app_server
 
 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/syslog_daemon
@@ -114,22 +110,16 @@ if [ "$isReadOnly" = "yes" ]; then
 fi
 
 
-# Launch Terminal or consoled depending on $SAFEMODE
-if [ "$SAFEMODE" != "yes" ]; then
-	if [ -e /etc/users ]; then
-		launch system/Login
-		# nothing more
-	else
-		cd /boot/home
-		launch system/Tracker
-		launch system/Deskbar
-
-		# install ProcessController in the deskbar
-		(sleep 7; /boot/system/apps/ProcessController -deskbar) &
-	fi
-	launch system/apps/Terminal
+if [ -e /etc/users ]; then
+	launch system/Login
+	# nothing more
 else
-	launch system/bin/consoled
+	cd /boot/home
+	launch system/Tracker
+	launch system/Deskbar
+
+	# install ProcessController in the deskbar
+	(sleep 7; /boot/system/apps/ProcessController -deskbar) &
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then