diff --git a/extensions/typescript-language-features/src/features/rename.ts b/extensions/typescript-language-features/src/features/rename.ts
index 2ac051e4119..3547b15d508 100644
--- a/extensions/typescript-language-features/src/features/rename.ts
+++ b/extensions/typescript-language-features/src/features/rename.ts
@@ -38,11 +38,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 			const triggerSpan = renameInfo.triggerSpan;
 			if (triggerSpan) {
 				const range = typeConverters.Range.fromTextSpan(triggerSpan);
-				// Until https://github.com/Microsoft/vscode/issues/58907 is fixed, the returned range must include the
-				// rename trigger position.
-				if (!range.contains(position)) {
-					return Promise.reject<vscode.Range>(localize('cannotRename', "You cannot rename this element"));
-				}
 				return range;
 			}
 		}
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 453d846d693..324a5beb114 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -524,9 +524,8 @@ class RenameAdapter {
 			if (!range) {
 				return undefined;
 			}
-
-			if (!range.contains(pos)) {
-				console.warn('INVALID rename location: range must contain position');
+			if (range.start.line > pos.line || range.end.line < pos.line) {
+				console.warn('INVALID rename location: position line must be within range start/end lines');
 				return undefined;
 			}
 			return { range: typeConvert.Range.from(range), text };