diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt
index 0eb5123943c..e30c86d5256 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt
@@ -116,10 +116,6 @@ internal interface KtFirAnalysisSessionComponent {
     }
 
     fun ConeSubstitutor.toKtSubstitutor(): KtSubstitutor {
-        return when (this) {
-            ConeSubstitutor.Empty -> KtSubstitutor.Empty(analysisSession.token)
-            is ConeSubstitutorByMap -> KtFirMapBackedSubstitutor(this, analysisSession.firSymbolBuilder)
-            else -> KtFirGenericSubstitutor(this, analysisSession.firSymbolBuilder)
-        }
+        return analysisSession.firSymbolBuilder.typeBuilder.buildSubstitutor(this)
     }
 }