diff --git a/src/Compilers/Core/Portable/CommandLine/CommonCommandLineArguments.cs b/src/Compilers/Core/Portable/CommandLine/CommonCommandLineArguments.cs
index 1dd244ffc7ba0e681cccd7c48c2c86d9a0636e60..4ff945367821cb40390f67adc58b6524132f48f7 100644
--- a/src/Compilers/Core/Portable/CommandLine/CommonCommandLineArguments.cs
+++ b/src/Compilers/Core/Portable/CommandLine/CommonCommandLineArguments.cs
@@ -284,12 +284,10 @@ public CompilationOptions CompilationOptions
 
         internal StrongNameProvider GetStrongNameProvider(StrongNameFileSystem fileSystem)
         {
-            bool fallback = 
-                ParseOptionsCore.Features.ContainsKey("UseLegacyStrongNameProvider") ||
-                CompilationOptionsCore.CryptoKeyContainer != null;
-            return fallback ?
-                (StrongNameProvider)new DesktopStrongNameProvider(KeyFileSearchPaths, null, fileSystem) :
-                (StrongNameProvider)new PortableStrongNameProvider(KeyFileSearchPaths, fileSystem);
+            // https://github.com/dotnet/roslyn/issues/23521
+            // Disable the portable strong name provider until we can find and fix the
+            // root cause of the bug
+            return new DesktopStrongNameProvider(KeyFileSearchPaths, null, fileSystem);
         }
 
         internal CommandLineArguments()