diff --git a/src/services/services.ts b/src/services/services.ts
index a414e70cc5..fa49117626 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2378,8 +2378,9 @@ module ts {
             }
 
             if (node.kind !== SyntaxKind.Identifier &&
-                node.kind !== SyntaxKind.ThisKeyword &&
-                node.kind !== SyntaxKind.SuperKeyword &&
+                // TODO (drosen): This should be enabled in a later release - currently breaks rename.
+                //node.kind !== SyntaxKind.ThisKeyword &&
+                //node.kind !== SyntaxKind.SuperKeyword &&
                 !isLiteralNameOfPropertyDeclarationOrIndexAccess(node) &&
                 !isNameOfExternalModuleImportOrDeclaration(node)) {
                 return undefined;
diff --git a/tests/cases/fourslash/findAllRefsThisKeywordMultipleFiles.ts b/tests/cases/fourslash/findAllRefsThisKeywordMultipleFiles.ts
index bc31ffd157..4b9f7a450e 100644
--- a/tests/cases/fourslash/findAllRefsThisKeywordMultipleFiles.ts
+++ b/tests/cases/fourslash/findAllRefsThisKeywordMultipleFiles.ts
@@ -12,4 +12,7 @@
 
 goTo.file("file1.ts");
 goTo.marker();
-verify.referencesCountIs(8);
\ No newline at end of file
+
+// TODO (drosen): The CURRENT behavior is that findAllRefs doesn't work on 'this' or 'super' keywords.
+//                This should change down the line.
+verify.referencesCountIs(0);
\ No newline at end of file