diff --git a/PolyShim/NetCore21/ManualResetValueTaskSourceCore.cs b/PolyShim/NetCore21/ManualResetValueTaskSourceCore.cs
index 7d01741b..5f0b3d0d 100644
--- a/PolyShim/NetCore21/ManualResetValueTaskSourceCore.cs
+++ b/PolyShim/NetCore21/ManualResetValueTaskSourceCore.cs
@@ -1,5 +1,6 @@
+// System.Threading.Tasks.Extensions compatibility package does NOT provide this type, so no FEATURE_VALUETASK* guards
+#if (NETCOREAPP && !NETCOREAPP2_1_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD && !NETSTANDARD2_1_OR_GREATER)
 #if FEATURE_TASK
-#if !FEATURE_VALUETASK_SOURCES_MANUALRESET
 #nullable enable
 #pragma warning disable CS0436
 
diff --git a/PolyShim/PolyShim.targets b/PolyShim/PolyShim.targets
index 0b925a2b..c5fc2697 100644
--- a/PolyShim/PolyShim.targets
+++ b/PolyShim/PolyShim.targets
@@ -260,28 +260,6 @@
         >$(DefineConstants);FEATURE_VALUETASK_SOURCES</DefineConstants
       >
 
-      <!--
-        FEATURE_VALUETASK_SOURCES_MANUALRESET: ManualResetValueTaskSourceCore<T> is available.
-        The compatibility package provides this type on .NET Standard >= 2.0, but not on .NET Framework
-        or on .NET Standard < 2.0. On .NET Core >= 2.1 and .NET Standard >= 2.1, it is available natively.
-      -->
-      <FeatureValueTaskSourcesManualReset>false</FeatureValueTaskSourcesManualReset>
-      <FeatureValueTaskSourcesManualReset
-        Condition="$(IsNetCoreApp) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))"
-        >true</FeatureValueTaskSourcesManualReset
-      >
-      <FeatureValueTaskSourcesManualReset
-        Condition="$(IsNetStandard) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))"
-        >true</FeatureValueTaskSourcesManualReset
-      >
-      <FeatureValueTaskSourcesManualReset
-        Condition="$(IsNetStandard) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) AND @(ReferencePath-&gt;AnyHaveMetadataValue('Filename', 'System.Threading.Tasks.Extensions'))"
-        >true</FeatureValueTaskSourcesManualReset
-      >
-      <DefineConstants Condition="$(FeatureValueTaskSourcesManualReset)"
-        >$(DefineConstants);FEATURE_VALUETASK_SOURCES_MANUALRESET</DefineConstants
-      >
-
       <FeatureValueTuple>false</FeatureValueTuple>
       <FeatureValueTuple
         Condition="@(ReferencePath-&gt;AnyHaveMetadataValue('Filename', 'System.ValueTuple'))"