--- a/installationservices/swi/source/certstoretobin/Util.pm	Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/source/certstoretobin/Util.pm	Wed Sep 01 12:22:02 2010 +0100
@@ -251,8 +251,6 @@
     my $self = shift;
     die "self not defined\n" if (not defined($self));
 
-	my $sbsflag = index("@_", "sbs");
-	
     $self->info("Invoking: @_\n");
 
     # Redirect stderr into stdout.
@@ -268,7 +266,9 @@
 
     my @warnstrings = ();
 
-  	if($sbsflag != -1)
+    my $BuildSystemVersion = $ENV{'SBS_VERSION'};
+ 
+ 	if ($BuildSystemVersion == 2) 
  	{
  		foreach (@out)
  		{