diff --git a/Directory.Build.targets b/Directory.Build.targets
index 782bcd9..de3f613 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -6,7 +6,8 @@
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <!-- https://docs.microsoft.com/windows/win32/wmisdk/common-information-model -->
-    <DefineConstants>$(DefineConstants);FEATURE_CIM</DefineConstants>
+    <!-- https://github.com/kohsuke/winsw/issues/411 -->
+    <!-- <DefineConstants>$(DefineConstants);FEATURE_CIM</DefineConstants> -->
   </PropertyGroup>
 
 </Project>
diff --git a/src/Core/WinSWCore/WinSWCore.csproj b/src/Core/WinSWCore/WinSWCore.csproj
index d6d93e9..7d87b0a 100644
--- a/src/Core/WinSWCore/WinSWCore.csproj
+++ b/src/Core/WinSWCore/WinSWCore.csproj
@@ -14,8 +14,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
+    <!-- https://github.com/kohsuke/winsw/issues/411 -->
+    <!-- <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" /> -->
     <PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
   </ItemGroup>
 
   <!-- error NU1605: Detected package downgrade: log4net 2.0.8 -->