--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed May 12 14:31:16 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed May 12 17:44:08 2010 -0500
@@ -496,9 +496,9 @@
 			osVersionLabel.setForeground(RED);
 			osVersionLabel.setBackground(GRAY);
 		}
-		else if (sdk.getOSVersion().getMajor() < 9 ||
-				 (sdk.getOSVersion().getMajor() == 9 && sdk.getOSVersion().getMinor() <= 4)){
-			// TODO: Temporary work to remove ABLD support
+		else if (!SDKCorePlugin.SUPPORTS_SBSV1_BUILDER && 
+				 (sdk.getOSVersion().getMajor() < 9 ||
+				 (sdk.getOSVersion().getMajor() == 9 && sdk.getOSVersion().getMinor() <= 4))){
 			sdkHasError = true;
 			osVersionLabel.setText(OS_VERSION_LABEL + "This OS version is not supported: " + sdk.getOSVersion()); 
 			osVersionLabel.setForeground(RED);