diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
index 35ae594dd6b..660f09680e5 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
@@ -75,7 +75,7 @@ internal class KtFirReferenceShortener(
         callableShortenOption: (KtCallableSymbol) -> ShortenOption
     ): ShortenCommand {
         val declarationToVisit = file.findSmallestDeclarationContainingSelection(selection)
-            ?: file.withDeclarationsResolvedToBodyResolve()
+            ?: file
 
         val firDeclaration = declarationToVisit.getOrBuildFir(firResolveSession) as? FirDeclaration ?: return ShortenCommandImpl(
             file.createSmartPointer(),
@@ -108,14 +108,6 @@ internal class KtFirReferenceShortener(
             collector.qualifiersToShorten.map { it.element }.distinct().map { it.createSmartPointer() }
         )
     }
-
-    private fun KtFile.withDeclarationsResolvedToBodyResolve(): KtFile {
-        for (declaration in declarations) {
-            declaration.getOrBuildFir(firResolveSession) // temporary hack, resolves declaration to BODY_RESOLVE stage
-        }
-
-        return this
-    }
 }
 
 private fun KtFile.findSmallestDeclarationContainingSelection(selection: TextRange): KtDeclaration? =