diff --git a/src/Workspaces/CSharpTest/CodeGeneration/AddImportsTests.cs b/src/Workspaces/CSharpTest/CodeGeneration/AddImportsTests.cs
index b33f1eba2d1521916918d97eafbb752907367dce..225d8f155eb92c6101de6fe6b7522ef876acf663 100644
--- a/src/Workspaces/CSharpTest/CodeGeneration/AddImportsTests.cs
+++ b/src/Workspaces/CSharpTest/CodeGeneration/AddImportsTests.cs
@@ -1240,7 +1240,8 @@ class C
 }", safe: true, useSymbolAnnotations);
         }
 
-        [Theory, InlineData(true), InlineData(false)]
+        [Theory(Skip = "https://github.com/dotnet/roslyn/issues/39641"), InlineData(true), InlineData(false)]
+        [WorkItem(39641, "https://github.com/dotnet/roslyn/issues/39641")]
         public async Task TestSafeWithMatchingSimpleNameInAllLocations(bool useSymbolAnnotations)
         {
             await TestAsync(
@@ -1343,7 +1344,7 @@ B.C1 M(B.C1 c1, C2 c2)
 
     {
         B.C1 result = (B.C1)c1 ?? new B.C1() ?? B.C1.P ?? new B.C1[0] { }[0] ?? new List<B.C1>()[0] ?? (B.C1?)null;
-        (global::B.C1 a, int b) = (default, default);
+        (B.C1 a, int b) = (default, default);
         return result;
     }
 }", safe: true, useSymbolAnnotations);
diff --git a/src/Workspaces/Core/Portable/Shared/Utilities/SymbolEquivalenceComparer.EquivalenceVisitor.cs b/src/Workspaces/Core/Portable/Shared/Utilities/SymbolEquivalenceComparer.EquivalenceVisitor.cs
index b2ab36aaf8ab50e98ca0f6467e809840fa0a8e15..432959e0a538d55eb67bd25ccf5da210a20bc071 100644
--- a/src/Workspaces/Core/Portable/Shared/Utilities/SymbolEquivalenceComparer.EquivalenceVisitor.cs
+++ b/src/Workspaces/Core/Portable/Shared/Utilities/SymbolEquivalenceComparer.EquivalenceVisitor.cs
@@ -43,8 +43,8 @@ public bool AreEquivalent(ISymbol x, ISymbol y, Dictionary<INamedTypeSymbol, INa
                     throw new InvalidOperationException("Stack too deep.");
                 }
 #endif
-                // This is a temporary workaround sufficient to get existing tests passing. This component should be 
-                // be modified to properly deal with differences caused by nullability.
+                // https://github.com/dotnet/roslyn/issues/39643 This is a temporary workaround sufficient to get existing tests passing.
+                // This component should be modified to properly deal with differences caused by nullability.
                 if (x is ITypeSymbol xType && y is ITypeSymbol yType && xType.IsDefinition != yType.IsDefinition)
                 {
                     if (x.IsDefinition)