--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Thu May 13 14:39:17 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Fri May 14 10:42:12 2010 -0500
@@ -80,10 +80,11 @@
 	public static ISDKManager getSDKManager() {
 		if (sdkManager == null) {
 			// TODO: SDKManagerRaptorOnly, currently only works on Linux
-//			if (HostOS.IS_WIN32 && SUPPORTS_SBSV1_BUILDER)
+			// ... and SDKManager depends on Windows
+			if (HostOS.IS_WIN32)
 				sdkManager = new SDKManager();
-//			else
-//				sdkManager = new SDKManagerRaptorOnly();
+			else
+				sdkManager = new SDKManagerRaptorOnly();
 		}
 		return sdkManager;
 	}