diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index bc88d16..2460d5d 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -18,7 +18,6 @@
 # Platform Tools Component
 ##############################################################################
 
-prebuilt/darwin-x86/llvm-rs-cc/llvm-rs-cc      platform-tools/llvm-rs-cc
 
 
 ##############################################################################
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index c74216e..1a9a890 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -18,7 +18,6 @@
 # Platform Tools Component
 ##############################################################################
 
-prebuilt/linux-x86/llvm-rs-cc/llvm-rs-cc      platform-tools/llvm-rs-cc
 
 
 ##############################################################################
diff --git a/build/sdk.atree b/build/sdk.atree
index bd80320..3d7d1af 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -41,7 +41,7 @@
 bin/adb                                       platform-tools/adb
 bin/aapt                                      platform-tools/aapt
 bin/aidl                                      platform-tools/aidl
-bin/llvm-rs-cc                                platform-tools/llvm-rs-cc-2
+bin/llvm-rs-cc                                platform-tools/llvm-rs-cc
 development/sdk/llvm-rs-cc.txt                platform-tools/llvm-rs-cc.txt
 
 # dx
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 49cb78c..5f60970 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -59,7 +59,7 @@
 LIB=$TEMP_SDK_DIR/tools/lib
 rm $V $TOOLS/{dmtracedump,etc1tool,hprof-conv,sqlite3,zipalign}
 rm $V $LIB/*/swt.jar
-rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc,llvm-rs-cc-2}
+rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc}
 
 # Copy all the new stuff in tools
 # Note: some tools are first copied here and then moved in platform-tools
@@ -101,10 +101,7 @@
 cp $V ${TOPDIR}dalvik/dx/etc/dx.bat $PLATFORM_TOOLS/
 mv $V $TOOLS/{adb.exe,aapt.exe,aidl.exe,dexdump.exe} $PLATFORM_TOOLS/
 mv $V $TOOLS/Adb*.dll $PLATFORM_TOOLS/
-# The platform actually produces llvm-rs-cc-2 (via sdk.atree), whereas
-# the original version 1 (just named llvm-rs-cc) is stored in the prebuilts.
-cp $V ${TOPDIR}prebuilt/windows/llvm-rs-cc/llvm-rs-cc.exe $PLATFORM_TOOLS/llvm-rs-cc.exe
-mv $V $TOOLS/llvm-rs-cc.exe                               $PLATFORM_TOOLS/llvm-rs-cc-2.exe
+mv $V $TOOLS/llvm-rs-cc.exe                               $PLATFORM_TOOLS/llvm-rs-cc.exe
 
 # Fix EOL chars to make window users happy - fix all files at the top level
 # as well as all batch files including those in platform-tools/
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index e259d29..8421a91 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -85,7 +85,6 @@
 		$(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
 	$(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe
-	$(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc-2.exe
 	$(hide) $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
 	$(hide) ( \
diff --git a/sdk/llvm-rs-cc.txt b/sdk/llvm-rs-cc.txt
index 34f81ef..ddfbc97 100644
--- a/sdk/llvm-rs-cc.txt
+++ b/sdk/llvm-rs-cc.txt
@@ -3,4 +3,3 @@
 # the compiler version number maps to the filename llvm-rs-cc-<version>[.exe]
 # except for version 1 which is simply llvm-rs-cc[.exe]
 1:11
-2:12
\ No newline at end of file