diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/buildTransitive/EnableConfigurationBindingGenerator.targets b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/buildTransitive/EnableConfigurationBindingGenerator.targets
index 06156ba479247..ba91b08d01ec8 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/buildTransitive/EnableConfigurationBindingGenerator.targets
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/buildTransitive/EnableConfigurationBindingGenerator.targets
@@ -1,17 +1,10 @@
 <Project>
-    <Target Name="_Microsoft_Extensions_Configuration_BinderGatherAnalyzers">
-        <ItemGroup>
-            <_Microsoft_Extensions_Configuration_BinderAnalyzer Include="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' == 'Microsoft.Extensions.Configuration.Binder'" />
-        </ItemGroup>
-    </Target>
-
     <Target Name="_Microsoft_Extensions_Configuration_BinderRemoveAnalyzer" 
             Condition="'$(EnableConfigurationBindingGenerator)' != 'true'"
-            AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets"
-            DependsOnTargets="_Microsoft_Extensions_Configuration_BinderGatherAnalyzers">
+            AfterTargets="ResolvePackageDependenciesForBuild;ResolveNuGetPackageAssets">
 
         <ItemGroup>
-            <Analyzer Remove="@(_Microsoft_Extensions_Configuration_BinderAnalyzer)" />
+            <Analyzer Remove="@(Analyzer->WithMetadataValue('NuGetPackageId', 'Microsoft.Extensions.Configuration.Binder'))" />
         </ItemGroup>
     </Target>
 </Project>