--- a/platform_hg/sysdefs/S60_SystemBuild.xml	Tue Apr 21 16:21:41 2009 +0100
+++ b/platform_hg/sysdefs/S60_SystemBuild.xml	Wed Apr 22 15:56:28 2009 +0100
@@ -682,7 +682,7 @@
 				<unitRef unit="sf_tools_swconfigtools"/>
 				<unitRef unit="ext_mw_websrvde"/>
 				<unitRef unit="ext_tools_oemrndtools"/>
-				<unitRef unit="sf_tools_themeinstaller"/>
+				<!--<unitRef unit="sf_tools_themeinstaller"/> -->
 				<unitRef unit="ext_tools_toolsextensions"/>
 				<unitRef unit="sf_app_commonemail"/>
 				<unitRef unit="sf_app_radio"/>
@@ -754,13 +754,13 @@
 -->
     <unitList name="S60_BINARY_ONLY" description="S60 build binary only components">
       <!--<unitRef unit="sf_os_wlan_wlan_bearer_wlanengine_symbian_3.1"/>-->
-      <unitRef unit="sf_mw_accesssec_eapol_eapol_symbian_ccxeapol"/>
+      <!--<unitRef unit="sf_mw_accesssec_eapol_eapol_symbian_ccxeapol"/>-->
       <unitRef unit="sf_mw_helix_helix_ren_src"/>
     </unitList>
 
     <unitList name="S60_BINARY_ONLY_SF" description="S60 build binary only components">
       <unitRef unit="sf_os_wlan_wlan_bearer_wlanengine_symbian_3.1"/>
-      <unitRef unit="sf_mw_accesssec_eapol_eapol_symbian_ccxeapol"/>
+      <!--<unitRef unit="sf_mw_accesssec_eapol_eapol_symbian_ccxeapol"/>-->
     </unitList>
 
     <!--