diff -r 2fea6aa94be6 -r a4712e0fdd56 sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Mon Jun 14 14:13:44 2010 +0100
+++ b/sf-platform/compile.ant.xml	Mon Jun 14 14:38:05 2010 +0100
@@ -24,8 +24,6 @@
        note: must be called from sf-os/s60-compile targets, as sys model input needed -->
   <target name="sf-do-compile" depends="create-canonical-sysdef-file">
     <echo message="INFO Using Helium 7+ for sf-do-compile"/>
-    
-    <propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
 
     <!-- explicitly run qmake once, as iterative build will repeat the step. if qmake is not unpacked already, then this step is skipped  -->
     <antcall target="run-qmake" inheritAll="false" inheritRefs="true">
@@ -46,7 +44,6 @@
 	
     <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->
       <or>
-        <isfalse value="${sf.unpack.tools}"/>
         <isfalse value="${sf.spec.toolsbaseline.enable}"/>
         <isfalse value="${sf.os.compile.fast}"/>
       </or>