--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Wed May 12 10:15:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Wed May 12 12:51:48 2010 -0500
@@ -277,11 +277,12 @@
 	 * @return true if SBSv1 is available, false otherwise
 	 */
 	public static boolean enableSBSv1Support() {
-		if (!enableSBSv2Support())
-			return true;
-		
-		if (isSBSv1Supported())
-			return true;
+		// TODO: Working on removing ABLD support.
+//		if (!enableSBSv2Support())
+//			return true;
+//		
+//		if (isSBSv1Supported())
+//			return true;
 		
 		return false;
 	}