diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index fe505730a..5d623074d 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,5 +1,3 @@
 Pkg.UserSrc=false
-// due to the codename this resolve to 20 instead of 21, so replace it with hardcoded version for now.
-//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=21.0.0 rc1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
 
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index b19b877b5..9c4705c8d 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=L
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=12