diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index 68eb684fe25..82a5da453b7 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -353,9 +353,7 @@ namespace ts.FindAllReferences {
         const references: ReferenceEntry[] = [];
         for (const sourceFile of sourceFiles) {
             cancellationToken.throwIfCancellationRequested();
-            if (sourceFileHasName(sourceFile, name)) {
-                addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references);
-            }
+            addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references);
         }
 
         return [{ definition, references }];
diff --git a/src/services/services.ts b/src/services/services.ts
index 20204165328..1fe2235a4ba 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1975,20 +1975,11 @@ namespace ts {
                         setNameTable((<LiteralExpression>node).text, node);
                     }
                     break;
-                case SyntaxKind.TypeOperator:
-                    setNameTable(tokenToString((node as ts.TypeOperatorNode).operator), node);
-                    forEachChild(node, walk);
-                    break;
                 default:
-                    if (isTypeKeyword(node.kind)) {
-                        setNameTable(tokenToString(node.kind), node);
-                    }
-                    else {
-                        forEachChild(node, walk);
-                        if (node.jsDoc) {
-                            for (const jsDoc of node.jsDoc) {
-                                forEachChild(jsDoc, walk);
-                            }
+                    forEachChild(node, walk);
+                    if (node.jsDoc) {
+                        for (const jsDoc of node.jsDoc) {
+                            forEachChild(jsDoc, walk);
                         }
                     }
             }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index dd337238da3..a1680da69c3 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1,4 +1,4 @@
-// These utilities are common to multiple language service features.
+// These utilities are common to multiple language service features.
 /* @internal */
 namespace ts {
     export const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
@@ -1126,7 +1126,6 @@ namespace ts {
             case SyntaxKind.BooleanKeyword:
             case SyntaxKind.NeverKeyword:
             case SyntaxKind.NumberKeyword:
-            case SyntaxKind.KeyOfKeyword:
             case SyntaxKind.ObjectKeyword:
             case SyntaxKind.StringKeyword:
             case SyntaxKind.SymbolKeyword:
diff --git a/tests/cases/fourslash/findAllRefsPrimitive.ts b/tests/cases/fourslash/findAllRefsPrimitive.ts
index 9bd3d62eabb..51c463843e1 100644
--- a/tests/cases/fourslash/findAllRefsPrimitive.ts
+++ b/tests/cases/fourslash/findAllRefsPrimitive.ts
@@ -21,8 +21,6 @@
 
 ////function v(v: [|void|]): [|void|];
 
-////function k(x: [|keyof|] Date): [|keyof|] Date;
-
 // @Filename: b.ts
 // const z: [|any|] = 0;