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 3f4ce816da6..a6745d6f08b 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
@@ -57,7 +57,7 @@ Copyright (C) 2016 Xamarin. All rights reserved.
     />
     <_ResolvedUserMonoAndroidAssembliesForDesigner
         Include="@(ResolvedUserAssemblies)"
-        Condition="'%(ResolvedUserAssemblies.TargetFrameworkIdentifier)' == 'MonoAndroid' Or '%(ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True'"
+        Condition="'%(ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True'"
     />
   </ItemGroup>
 </Target>
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs
index c163a95ff7c..0431005f7ba 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/FilterAssemblies.cs
@@ -19,9 +19,6 @@ public class FilterAssemblies : AndroidTask
 	{
 		public override string TaskPrefix => "FLT";
 
-		const string TargetFrameworkIdentifier = "MonoAndroid";
-		const string MonoAndroidReference = "Mono.Android";
-
 		public bool DesignTimeBuild { get; set; }
 
 		public ITaskItem [] InputAssemblies { get; set; }
@@ -42,19 +39,9 @@ public override bool RunTask ()
 				}
 				using (var pe = new PEReader (File.OpenRead (assemblyItem.ItemSpec))) {
 					var reader = pe.GetMetadataReader ();
-					var assemblyDefinition = reader.GetAssemblyDefinition ();
-					var targetFrameworkIdentifier = GetTargetFrameworkIdentifier (assemblyDefinition, reader);
-					if (string.Compare (targetFrameworkIdentifier, TargetFrameworkIdentifier, StringComparison.OrdinalIgnoreCase) == 0) {
-						output.Add (assemblyItem);
-						continue;
-					}
-
-					// In the rare case, [assembly: TargetFramework("MonoAndroid,Version=v9.0")] may not match
-					Log.LogDebugMessage ($"{nameof (TargetFrameworkIdentifier)} did not match: {assemblyItem.ItemSpec}");
-
-					// Fallback to looking for a Mono.Android reference
+					// By default look for a reference to Mono.Android.dll
 					if (HasReference (reader)) {
-						Log.LogDebugMessage ($"{MonoAndroidReference} reference found: {assemblyItem.ItemSpec}");
+						CheckAssemblyAttributes (reader);
 						output.Add (assemblyItem);
 						continue;
 					}
@@ -71,27 +58,13 @@ public override bool RunTask ()
 			return !Log.HasLoggedErrors;
 		}
 
-		string GetTargetFrameworkIdentifier (AssemblyDefinition assembly, MetadataReader reader)
+		void CheckAssemblyAttributes (MetadataReader reader)
 		{
-			string targetFrameworkIdentifier = null;
+			var assembly = reader.GetAssemblyDefinition ();
 			foreach (var handle in assembly.GetCustomAttributes ()) {
 				var attribute = reader.GetCustomAttribute (handle);
 				var name = reader.GetCustomAttributeFullName (attribute);
 				switch (name) {
-					case "System.Runtime.Versioning.TargetFrameworkAttribute":
-						var arguments = attribute.GetCustomAttributeArguments ();
-						foreach (var p in arguments.FixedArguments) {
-							// Of the form "MonoAndroid,Version=v8.1"
-							var value = p.Value?.ToString ();
-							if (!string.IsNullOrEmpty (value)) {
-								int commaIndex = value.IndexOf (",", StringComparison.Ordinal);
-								if (commaIndex != -1) {
-									targetFrameworkIdentifier = value.Substring (0, commaIndex);
-									break;
-								}
-							}
-						}
-						break;
 					case "Android.IncludeAndroidResourcesFromAttribute":
 					case "Android.NativeLibraryReferenceAttribute":
 					case "Java.Interop.JavaLibraryReferenceAttribute":
@@ -102,7 +75,6 @@ string GetTargetFrameworkIdentifier (AssemblyDefinition assembly, MetadataReader
 						break;
 				}
 			}
-			return targetFrameworkIdentifier;
 		}
 
 		bool HasReference (MetadataReader reader)
@@ -110,7 +82,7 @@ bool HasReference (MetadataReader reader)
 			foreach (var handle in reader.AssemblyReferences) {
 				var reference = reader.GetAssemblyReference (handle);
 				var name = reader.GetString (reference.Name);
-				if (MonoAndroidReference == name) {
+				if (name == "Mono.Android" || name == "Java.Interop") {
 					return true;
 				}
 			}
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveAssemblies.cs
index caf44bb52ac..65984f081fa 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveAssemblies.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveAssemblies.cs
@@ -214,23 +214,16 @@ void AddAssemblyReferences (MetadataResolver resolver, Dictionary<string, ITaskI
 			if (resolutionPath == null)
 				resolutionPath = new List<string>();
 
-			CheckAssemblyAttributes (assembly, reader, out string targetFrameworkIdentifier);
+			CheckAssemblyAttributes (assembly, reader);
 
 			LogMessage ("{0}Adding assembly reference for {1}, recursively...", new string (' ', indent), assemblyName);
 			resolutionPath.Add (assemblyName);
 			indent += 2;
 
 			// Add this assembly
-			ITaskItem assemblyItem = null;
-			if (topLevel) {
-				if (assemblies.TryGetValue (assemblyName, out assemblyItem)) {
-					if (!string.IsNullOrEmpty (targetFrameworkIdentifier) && string.IsNullOrEmpty (assemblyItem.GetMetadata ("TargetFrameworkIdentifier"))) {
-						assemblyItem.SetMetadata ("TargetFrameworkIdentifier", targetFrameworkIdentifier);
-					}
-				}
-			} else {
+			if (!assemblies.TryGetValue (assemblyName, out ITaskItem assemblyItem) && !topLevel) {
 				assemblies [assemblyName] = 
-					assemblyItem = CreateAssemblyTaskItem (assemblyPath, targetFrameworkIdentifier);
+					assemblyItem = CreateAssemblyTaskItem (assemblyPath);
 			}
 
 			// Recurse into each referenced assembly
@@ -239,8 +232,8 @@ void AddAssemblyReferences (MetadataResolver resolver, Dictionary<string, ITaskI
 				string reference_assembly;
 				try {
 					var referenceName = reader.GetString (reference.Name);
-					if (assemblyItem != null && referenceName == "Mono.Android") {
-						assemblyItem.SetMetadata ("HasMonoAndroidReference", "True");
+					if (referenceName == "Mono.Android" || referenceName == "Java.Interop") {
+						assemblyItem?.SetMetadata ("HasMonoAndroidReference", "True");
 					}
 					reference_assembly = resolver.Resolve (referenceName);
 				} catch (FileNotFoundException ex) {
@@ -272,10 +265,8 @@ void AddAssemblyReferences (MetadataResolver resolver, Dictionary<string, ITaskI
 			resolutionPath.RemoveAt (resolutionPath.Count - 1);
 		}
 
-		void CheckAssemblyAttributes (AssemblyDefinition assembly, MetadataReader reader, out string targetFrameworkIdentifier)
+		void CheckAssemblyAttributes (AssemblyDefinition assembly, MetadataReader reader)
 		{
-			targetFrameworkIdentifier = null;
-
 			foreach (var handle in assembly.GetCustomAttributes ()) {
 				var attribute = reader.GetCustomAttribute (handle);
 				switch (reader.GetCustomAttributeFullName (attribute)) {
@@ -293,11 +284,12 @@ void CheckAssemblyAttributes (AssemblyDefinition assembly, MetadataReader reader
 							var arguments = attribute.GetCustomAttributeArguments ();
 							foreach (var p in arguments.FixedArguments) {
 								// Of the form "MonoAndroid,Version=v8.1"
+								// If this is a .NET 5 TFM, we won't emit these warnings
 								var value = p.Value?.ToString ();
 								if (!string.IsNullOrEmpty (value)) {
 									int commaIndex = value.IndexOf (",", StringComparison.Ordinal);
 									if (commaIndex != -1) {
-										targetFrameworkIdentifier = value.Substring (0, commaIndex);
+										string targetFrameworkIdentifier = value.Substring (0, commaIndex);
 										if (targetFrameworkIdentifier == "MonoAndroid") {
 											const string match = "Version=";
 											var versionIndex = value.IndexOf (match, commaIndex, StringComparison.Ordinal);
@@ -368,14 +360,12 @@ void ResolveI18nAssembly (MetadataResolver resolver, string name, Dictionary<str
 			assemblies [name] = CreateAssemblyTaskItem (assembly);
 		}
 
-		static ITaskItem CreateAssemblyTaskItem (string assembly, string targetFrameworkIdentifier = null)
+		static ITaskItem CreateAssemblyTaskItem (string assembly)
 		{
 			var assemblyFullPath = Path.GetFullPath (assembly);
-			var dictionary = new Dictionary<string, string> (2) {
+			var dictionary = new Dictionary<string, string> (1) {
 				{ "ReferenceAssembly", assemblyFullPath },
 			};
-			if (!string.IsNullOrEmpty (targetFrameworkIdentifier))
-				dictionary.Add ("TargetFrameworkIdentifier", targetFrameworkIdentifier);
 			return new TaskItem (assemblyFullPath, dictionary);
 		}
 	}
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs
index eba23511cc6..a95ed6368e7 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs
@@ -92,7 +92,6 @@ public async Task XamarinForms ()
 			var expected = new [] {
 				"FormsViewGroup.dll",
 				"Xamarin.Forms.Platform.Android.dll",
-				"Xamarin.Forms.Platform.dll",
 			};
 			CollectionAssert.AreEqual (expected, actual);
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
index a5f778d5af4..74853befa44 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -290,10 +290,6 @@ public static string GetNativeLibraryAbi (ITaskItem lib)
 
 		public static bool IsMonoAndroidAssembly (ITaskItem assembly)
 		{
-			var tfi = assembly.GetMetadata ("TargetFrameworkIdentifier");
-			if (string.Compare (tfi, "MonoAndroid", StringComparison.OrdinalIgnoreCase) == 0)
-				return true;
-
 			var hasReference = assembly.GetMetadata ("HasMonoAndroidReference");
 			return bool.TryParse (hasReference, out bool value) && value;
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index f8f2c88398f..26b06810019 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -2032,7 +2032,7 @@ because xbuild doesn't support framework reference assemblies.
   <ItemGroup>
     <_ResolvedUserMonoAndroidAssemblies
         Include="@(_ResolvedUserAssemblies)"
-        Condition=" '%(_ResolvedUserAssemblies.TargetFrameworkIdentifier)' == 'MonoAndroid' Or '%(_ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True' "
+        Condition=" '%(_ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True' "
     />
   </ItemGroup>
 </Target>