diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets
index 13c502141e8..f25e67a55d5 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets
@@ -139,7 +139,6 @@ Copyright (C) 2016 Xamarin. All rights reserved.
       AndroidPackageName="$(_AndroidPackage)"
       EnablePreloadAssembliesDefault="$(_AndroidEnablePreloadAssembliesDefault)"
       InstantRunEnabled="$(_InstantRunEnabled)">
-    <Output TaskParameter="BuildId" PropertyName="_XamarinBuildId" />
   </GeneratePackageManagerJava>
 </Target>
 
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
index 29a2118a86f..303d4ae34b6 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs
@@ -22,8 +22,6 @@ public class GeneratePackageManagerJava : AndroidTask
 	{
 		public override string TaskPrefix => "GPM";
 
-		Guid buildId = Guid.NewGuid ();
-
 		[Required]
 		public ITaskItem[] ResolvedAssemblies { get; set; }
 
@@ -81,9 +79,6 @@ public class GeneratePackageManagerJava : AndroidTask
 		public bool EnableSGenConcurrent { get; set; }
 		public string? CustomBundleConfigFile { get; set; }
 
-		[Output]
-		public string BuildId { get; set; }
-
 		bool _Debug {
 			get {
 				return string.Equals (Debug, "true", StringComparison.OrdinalIgnoreCase);
@@ -92,9 +87,6 @@ bool _Debug {
 
 		public override bool RunTask ()
 		{
-			BuildId = buildId.ToString ();
-			Log.LogDebugMessage ("  [Output] BuildId: {0}", BuildId);
-
 			var doc = AndroidAppManifest.Load (Manifest, MonoAndroidHelper.SupportedVersions);
 			int minApiVersion = doc.MinSdkVersion == null ? 4 : (int) doc.MinSdkVersion;
 			// We need to include any special assemblies in the Assemblies list
@@ -191,9 +183,6 @@ void AddEnvironment ()
 				AddEnvironmentVariable (defaultMonoDebug[0], defaultMonoDebug[1]);
 			}
 
-			if (!environmentParser.HavebuildId)
-				AddEnvironmentVariable ("XAMARIN_BUILD_ID", BuildId);
-
 			if (!environmentParser.HaveHttpMessageHandler) {
 				if (HttpClientHandlerType == null)
 					AddEnvironmentVariable (defaultHttpMessageHandler[0], defaultHttpMessageHandler[1]);
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
index 55c05640ea6..df37ed7c133 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
@@ -942,8 +942,6 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 			var targets = new [] {
 				"_GenerateJavaStubs",
 				"_GeneratePackageManagerJava",
-				"_CompileNativeAssemblySources",
-				"_CreateApplicationSharedLibraries",
 			};
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs b/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
index 767ac77e9e8..04db583a57d 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/EnvironmentFilesParser.cs
@@ -11,7 +11,6 @@ namespace Xamarin.Android.Tasks
 	class EnvironmentFilesParser
 	{
 		public bool BrokenExceptionTransitions       { get; set; }
-		public bool HavebuildId                      { get; private set; }
 		public bool HaveHttpMessageHandler           { get; private set; }
 		public bool HaveLogLevel                     { get; private set; }
 		public bool HaveMonoDebug                    { get; private set; }
@@ -46,8 +45,6 @@ public void Parse (ITaskItem[] environments, SequencePointsMode sequencePointsMo
 							log.LogCodedWarning ("XA2000", Properties.Resources.XA2000_gcParams_bridgeImpl);
 						}
 					}
-					if (lineToWrite.StartsWith ("XAMARIN_BUILD_ID=", StringComparison.Ordinal))
-						HavebuildId = true;
 					if (lineToWrite.StartsWith ("MONO_DEBUG=", StringComparison.Ordinal)) {
 						HaveMonoDebug = true;
 						if (sequencePointsMode != SequencePointsMode.None && !lineToWrite.Contains ("gen-compact-seq-points"))
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index df1bf28d741..cf0964655c9 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -1728,17 +1728,9 @@ because xbuild doesn't support framework reference assemblies.
     EnableMarshalMethods="$(_AndroidUseMarshalMethods)"
     CustomBundleConfigFile="$(AndroidBundleConfigurationFile)"
   >
-    <Output TaskParameter="BuildId" PropertyName="_XamarinBuildId" />
   </GeneratePackageManagerJava>
   <Touch Files="$(_AndroidStampDirectory)_GeneratePackageManagerJava.stamp" AlwaysCreate="True" />
-  <WriteLinesToFile
-      File="$(_AndroidBuildIdFile)"
-      Lines="$(_XamarinBuildId)"
-      Overwrite="true"
-      WriteOnlyWhenDifferent="true"
-  />
   <ItemGroup>
-    <FileWrites Include="$(_AndroidBuildIdFile)" />
     <FileWrites Include="@(_EnvironmentAssemblySource)" />
   </ItemGroup>
 </Target>
@@ -2547,7 +2539,6 @@ because xbuild doesn't support framework reference assemblies.
 	<Delete Files="$(_AndroidAapt2VersionFile)" />
 	<Delete Files="$(IntermediateOutputPath)R.txt" />
 	<Delete Files="$(_AndroidMainDexListFile)" />
-	<Delete Files="$(_AndroidBuildIdFile)" />
 	<Delete Files="$(_ResolvedUserAssembliesHashFile)" />
 </Target>