diff --git a/Build/debugpy-version.txt b/Build/debugpy-version.txt
index 9eadd6baad..d2c4b27150 100644
--- a/Build/debugpy-version.txt
+++ b/Build/debugpy-version.txt
@@ -1 +1 @@
-1.8.6
\ No newline at end of file
+1.8.7
\ No newline at end of file
diff --git a/Python/Product/VSInterpreters/Interpreter/PythonRegistrySearch.cs b/Python/Product/VSInterpreters/Interpreter/PythonRegistrySearch.cs
index bcee7f2f95..7ed28f0625 100644
--- a/Python/Product/VSInterpreters/Interpreter/PythonRegistrySearch.cs
+++ b/Python/Product/VSInterpreters/Interpreter/PythonRegistrySearch.cs
@@ -188,9 +188,6 @@ InterpreterArchitecture assumedArch
                 return null; // Python 2.x is no longer supported.
             }
 
-            if (sysVersion.ToLanguageVersion() == PythonLanguageVersion.None) {
-                sysVersion = new Version(0, 0);
-            }
 
             if (!InterpreterArchitecture.TryParse(tagKey.GetValue("SysArchitecture", null) as string, out var arch)) {
                 arch = assumedArch;
diff --git a/Python/Product/VSInterpreters/Interpreter/WorkspaceInterpreterFactoryProvider.cs b/Python/Product/VSInterpreters/Interpreter/WorkspaceInterpreterFactoryProvider.cs
index 8f7d555efb..e991ca6e42 100644
--- a/Python/Product/VSInterpreters/Interpreter/WorkspaceInterpreterFactoryProvider.cs
+++ b/Python/Product/VSInterpreters/Interpreter/WorkspaceInterpreterFactoryProvider.cs
@@ -316,9 +316,6 @@ private PythonInterpreterInformation CreateEnvironmentInfo(string interpreterPat
             var arch = CPythonInterpreterFactoryProvider.ArchitectureFromExe(interpreterPath);
             var version = CPythonInterpreterFactoryProvider.VersionFromSysVersionInfo(interpreterPath);
 
-            if (version.ToLanguageVersion() == PythonLanguageVersion.None) {
-                version = new Version(0, 0);
-            }
 
             var name = Path.GetFileName(prefixPath);
             var description = name;