diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt
index 8644223e04a..e11568313de 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt
@@ -15,9 +15,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.name.ClassId
 
@@ -40,12 +38,6 @@ internal class KtFe10DescConstructorSymbol(
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.returnType.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            val containingClass = descriptor.constructedClass.containingDeclaration as? ClassDescriptor ?: return null
-            return containingClass.defaultType.toKtType(analysisContext)
-        }
-
     override val typeParameters: List<KtTypeParameterSymbol>
         get() = withValidityAssertion { descriptor.typeParameters.map { KtFe10DescTypeParameterSymbol(it, analysisContext) } }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt
index 6f17a291ed5..29aab939648 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertyGetterSymbol.kt
@@ -14,10 +14,6 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.*
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.isExplicitOverride
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
@@ -25,7 +21,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -70,9 +65,6 @@ class KtFe10DescDefaultPropertyGetterSymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { propertyDescriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override val modality: Modality
         get() = withValidityAssertion { propertyDescriptor.ktModality }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt
index d0afa926814..fa06fe8af7b 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescDefaultPropertySetterSymbol.kt
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -67,9 +66,6 @@ class KtFe10DescDefaultPropertySetterSymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { propertyDescriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { propertyDescriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override val modality: Modality
         get() = withValidityAssertion { propertyDescriptor.ktModality }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt
index 7cbc96d769e..5b6435dbdbe 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
@@ -75,9 +74,6 @@ internal class KtFe10DescFunctionSymbol(
     override val isExtension: Boolean
         get() = withValidityAssertion { descriptor.isExtension }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override val typeParameters: List<KtTypeParameterSymbol>
         get() = withValidityAssertion { descriptor.typeParameters.map { KtFe10DescTypeParameterSymbol(it, analysisContext) } }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt
index 9303ac40676..a244e80887a 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
@@ -91,9 +90,6 @@ internal class KtFe10DescKotlinPropertySymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override val hasBackingField: Boolean
         get() = withValidityAssertion {
             val bindingContext = analysisContext.resolveSession.bindingContext
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt
index 5ad5657c4ae..2023d05f351 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor
 import org.jetbrains.kotlin.descriptors.hasBody
@@ -51,9 +50,6 @@ internal class KtFe10DescPropertyGetterSymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override fun createPointer(): KtSymbolPointer<KtPropertyGetterSymbol> = withValidityAssertion {
         return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer()
     }
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt
index 7ea650cd8f7..770a1042521 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor
 import org.jetbrains.kotlin.descriptors.hasBody
@@ -53,9 +52,6 @@ internal class KtFe10DescPropertySetterSymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override fun createPointer(): KtSymbolPointer<KtPropertySetterSymbol> {
         withValidityAssertion {
             return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer()
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt
index 5057aebf0ef..e1adfc82c43 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtConstantValue
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.name.CallableId
@@ -87,8 +86,6 @@ internal class KtFe10DescSyntheticJavaPropertySymbol(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
 
     override fun createPointer(): KtSymbolPointer<KtSyntheticJavaPropertySymbol> = withValidityAssertion {
         return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer()
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt
index 9c3249ab89a..28014eccd79 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt
@@ -8,12 +8,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.*
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
-import org.jetbrains.kotlin.analysis.api.symbols.*
+import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtConstantValue
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyDescriptor
@@ -84,9 +86,6 @@ internal class KtFe10DescSyntheticJavaPropertySymbolForOverride(
     override val receiverType: KtTypeAndAnnotations?
         get() = withValidityAssertion { descriptor.extensionReceiverParameter?.type?.toKtTypeAndAnnotations(analysisContext) }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion { descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext) }
-
     override fun createPointer(): KtSymbolPointer<KtSyntheticJavaPropertySymbol> = withValidityAssertion {
         return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer()
     }
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiConstructorSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiConstructorSymbol.kt
index 197c5f99a2f..ee6fc150d21 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiConstructorSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiConstructorSymbol.kt
@@ -7,9 +7,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased
 
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
-import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.KtFe10PsiSymbol
@@ -22,9 +20,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
@@ -59,12 +55,6 @@ internal class KtFe10PsiConstructorSymbol(
             descriptor?.returnType?.toKtTypeAndAnnotations(analysisContext) ?: createErrorTypeAndAnnotations()
         }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            val containingClass = descriptor?.constructedClass?.containingDeclaration as? ClassDescriptor ?: return null
-            return containingClass.defaultType.toKtType(analysisContext)
-        }
-
     override val visibility: Visibility
         get() = withValidityAssertion { psi.ktVisibility ?: descriptor?.ktVisibility ?: Visibilities.Public }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt
index f8063a7b41c..a259d876076 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertyGetterSymbol.kt
@@ -11,14 +11,12 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolOrigin
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
@@ -26,7 +24,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -87,15 +84,6 @@ class KtFe10PsiDefaultPropertyGetterSymbol(
             }
         }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            if (propertyPsi.isTopLevel) {
-                return null
-            }
-
-            return descriptor?.dispatchReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
-        }
-
     override val modality: Modality
         get() = withValidityAssertion { propertyPsi.ktModality ?: descriptor?.ktModality ?: Modality.FINAL }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt
index 34a195ac850..703cd85b461 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiDefaultPropertySetterSymbol.kt
@@ -11,13 +11,11 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.base.KtFe10Symbol
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolOrigin
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
@@ -26,7 +24,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -94,15 +91,6 @@ class KtFe10PsiDefaultPropertySetterSymbol(
             }
         }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            if (propertyPsi.isTopLevel) {
-                return null
-            }
-
-            return descriptor?.dispatchReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
-        }
-
     override val modality: Modality
         get() = withValidityAssertion { propertyPsi.ktModality ?: descriptor?.ktModality ?: Modality.FINAL }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt
index b5dc864ba80..4fd7b975d42 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
@@ -21,7 +20,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
@@ -31,8 +29,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.psi.KtObjectDeclaration
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
 import org.jetbrains.kotlin.resolve.BindingContext
 
@@ -98,16 +94,6 @@ internal class KtFe10PsiFunctionSymbol(
     override val name: Name
         get() = withValidityAssertion { psi.nameAsSafeName }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            val containingClass = psi.containingClassOrObject
-            if (containingClass == null || containingClass is KtObjectDeclaration) {
-                return null
-            }
-
-            return descriptor?.dispatchReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
-        }
-
     override val typeParameters: List<KtTypeParameterSymbol>
         get() = withValidityAssertion { psi.typeParameters.map { KtFe10PsiTypeParameterSymbol(it, analysisContext) } }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt
index 7997b1fb09b..9994cf0b9d0 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt
@@ -7,16 +7,12 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased
 
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.*
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtConstantValue
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolKind
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
@@ -27,7 +23,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtUnsupportedConstantValue
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -144,15 +139,6 @@ internal class KtFe10PsiKotlinPropertySymbol(
     override val name: Name
         get() = withValidityAssertion { psi.nameAsSafeName }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            if (psi.isTopLevel) {
-                return null
-            }
-
-            return descriptor?.dispatchReceiverParameter?.type?.toKtType(analysisContext) ?: createErrorType()
-        }
-
     override val modality: Modality
         get() = withValidityAssertion { psi.ktModality ?: descriptor?.ktModality ?: Modality.FINAL }
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt
index 153dfa9e5a0..ad2d0c78eb9 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt
@@ -9,17 +9,18 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.KtFe10PsiSymbol
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorTypeAndAnnotations
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor
@@ -80,16 +81,6 @@ internal class KtFe10PsiPropertyGetterSymbol(
             }
         }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            val descriptor = this.descriptor
-            return when {
-                descriptor != null -> descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext)
-                !psi.property.isTopLevel -> createErrorType()
-                else -> null
-            }
-        }
-
     override fun createPointer(): KtSymbolPointer<KtPropertyGetterSymbol> = withValidityAssertion {
         return KtPsiBasedSymbolPointer.createForSymbolFromSource(this) ?: KtFe10NeverRestoringSymbolPointer()
     }
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt
index d3d288df0ed..98b404ffbc4 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertySetterSymbol.kt
@@ -9,17 +9,18 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtType
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.*
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.KtFe10PsiSymbol
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorTypeAndAnnotations
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktModality
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertySetterDescriptor
@@ -81,16 +82,6 @@ internal class KtFe10PsiPropertySetterSymbol(
             }
         }
 
-    override val dispatchType: KtType?
-        get() = withValidityAssertion {
-            val descriptor = this.descriptor
-            return when {
-                descriptor != null -> descriptor.dispatchReceiverParameter?.type?.toKtType(analysisContext)
-                !psi.property.isTopLevel -> createErrorType()
-                else -> null
-            }
-        }
-
     override val parameter: KtValueParameterSymbol
         get() = withValidityAssertion {
             val parameter = psi.parameter
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt
index 950e683ed76..d186435451b 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirConstructorSymbol.kt
@@ -6,14 +6,8 @@
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.fir.containingClass
-import org.jetbrains.kotlin.fir.declarations.FirConstructor
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
@@ -21,7 +15,6 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirConstructorSy
 import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.createSignature
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
 import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
@@ -31,8 +24,13 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPoin
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
+import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.fir.containingClass
+import org.jetbrains.kotlin.fir.declarations.FirConstructor
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
 import org.jetbrains.kotlin.name.ClassId
 
 internal class KtFirConstructorSymbol(
@@ -73,10 +71,6 @@ internal class KtFirConstructorSymbol(
         }
     }
 
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
-
     override fun createPointer(): KtSymbolPointer<KtConstructorSymbol> = withValidityAssertion {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         if (symbolKind == KtSymbolKind.LOCAL) {
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt
index 50e4684d73b..8d8be5936a6 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt
@@ -6,15 +6,8 @@
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.fir.containingClass
-import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.utils.*
-import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
@@ -23,15 +16,24 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirTopLevelFunct
 import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.createSignature
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
 import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
-import org.jetbrains.kotlin.analysis.api.symbols.pointers.*
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.WrongSymbolForSamConstructor
 import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
+import org.jetbrains.kotlin.fir.containingClass
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
+import org.jetbrains.kotlin.fir.declarations.utils.*
+import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
@@ -72,10 +74,6 @@ internal class KtFirFunctionSymbol(
     override val isInfix: Boolean get() = firRef.withFir { it.isInfix }
     override val isStatic: Boolean get() = firRef.withFir { it.isStatic }
 
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
-
     override val receiverType: KtTypeAndAnnotations? by cached {
         firRef.receiverTypeAndAnnotations(builder)
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt
index de773330ce6..9b9637f993b 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.KtFakeSourceElementKind
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.evaluate.KtFirConstantValueConverter
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirMemberPropert
 import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.createSignature
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
 import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.WrongSymbolForSamConstructor
 import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
@@ -64,10 +62,6 @@ internal class KtFirKotlinPropertySymbol(
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
-
     override val receiverType: KtTypeAndAnnotations? by cached {
         firRef.receiverTypeAndAnnotations(builder)
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt
index 6ec18e77b15..dd3f9243d78 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt
@@ -6,6 +6,21 @@
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
+import org.jetbrains.kotlin.analysis.api.fir.utils.cached
+import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
@@ -15,23 +30,6 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAcces
 import org.jetbrains.kotlin.fir.declarations.utils.isInline
 import org.jetbrains.kotlin.fir.declarations.utils.isOverride
 import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
-import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
-import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertyGetterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
-import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
-import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 
@@ -72,10 +70,6 @@ internal class KtFirPropertyGetterSymbol(
         } else null
     }
 
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
-
     override val receiverType: KtTypeAndAnnotations? by cached {
         firRef.receiverTypeAndAnnotations(builder)
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt
index c0f689747d5..19fabdc56d9 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt
@@ -6,6 +6,21 @@
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
+import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
+import org.jetbrains.kotlin.analysis.api.fir.utils.cached
+import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
+import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
+import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
@@ -15,23 +30,6 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAcces
 import org.jetbrains.kotlin.fir.declarations.utils.isInline
 import org.jetbrains.kotlin.fir.declarations.utils.isOverride
 import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
-import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
-import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
-import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
-import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySetterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
-import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
-import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
-import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 
@@ -80,10 +78,6 @@ internal class KtFirPropertySetterSymbol(
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
 
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
-
     override val receiverType: KtTypeAndAnnotations? by cached {
         firRef.receiverTypeAndAnnotations(builder)
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt
index 6008655f325..754b0f87fc3 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt
@@ -6,32 +6,30 @@
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
-import org.jetbrains.kotlin.fir.declarations.utils.isOverride
-import org.jetbrains.kotlin.fir.declarations.utils.isStatic
-import org.jetbrains.kotlin.analysis.api.fir.findPsi
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.evaluate.KtFirConstantValueConverter
+import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.containsAnnotation
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.getAnnotationClassIds
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.toAnnotationsList
 import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirJavaSyntheticPropertySymbolPointer
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
 import org.jetbrains.kotlin.analysis.api.fir.utils.firRef
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtConstantValue
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
-import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.containingClass
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
+import org.jetbrains.kotlin.fir.declarations.utils.isOverride
+import org.jetbrains.kotlin.fir.declarations.utils.isStatic
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
@@ -50,9 +48,6 @@ internal class KtFirSyntheticJavaPropertySymbol(
     override val annotatedType: KtTypeAndAnnotations by cached {
         firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder)
     }
-    override val dispatchType: KtType? by cached {
-        firRef.dispatchReceiverTypeAndAnnotations(builder)
-    }
 
     override val receiverType: KtTypeAndAnnotations? by cached {
         firRef.receiverTypeAndAnnotations(builder)
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt
index 26e441ba901..43170e89d16 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirTypeAndAnnotations.kt
@@ -5,22 +5,21 @@
 
 package org.jetbrains.kotlin.analysis.api.fir.symbols
 
-import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.resolve.transformers.resolveSupertypesInTheAir
-import org.jetbrains.kotlin.fir.types.ConeKotlinType
-import org.jetbrains.kotlin.fir.types.FirTypeRef
-import org.jetbrains.kotlin.fir.types.coneType
-import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveType
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.symbols.annotations.KtFirAnnotationCall
 import org.jetbrains.kotlin.analysis.api.fir.utils.FirRefWithValidityCheck
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotationCall
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.withValidityAssertion
+import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveType
+import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.resolve.transformers.resolveSupertypesInTheAir
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.fir.types.FirTypeRef
+import org.jetbrains.kotlin.fir.types.coneType
 
 internal class KtFirTypeAndAnnotations<T : FirDeclaration>(
     private val containingDeclaration: FirRefWithValidityCheck<T>,
@@ -92,10 +91,3 @@ internal fun FirRefWithValidityCheck<FirCallableDeclaration>.receiverTypeAndAnno
         }
     }
 }
-
-internal fun FirRefWithValidityCheck<FirCallableDeclaration>.dispatchReceiverTypeAndAnnotations(builder: KtSymbolByFirBuilder) =
-    withFir { fir ->
-        fir.dispatchReceiverType?.let {
-            builder.typeBuilder.buildKtType(it)
-        }
-    }
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
index 864cf32ab9c..4a8fbeb2fec 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
@@ -29,6 +29,12 @@ public object DebugSymbolRenderer {
         renderSymbol(symbol)
 
         withIndent {
+            @Suppress("DEPRECATION")
+            (symbol as? KtPossibleMemberSymbol)?.getDispatchReceiverType()?.let { dispatchType ->
+                appendLine().append("getDispatchReceiver()").append(": ")
+                renderType(dispatchType)
+            }
+
             KtSymbolInfoProviderMixIn::class.declaredMemberExtensionProperties
                 .asSequence()
                 .filter { (it.extensionReceiverParameter?.type?.classifier as? KClass<*>)?.isInstance(symbol) == true }
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt
index e5d906f31ca..2979867eb88 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtPossibleMemberSymbol.kt
@@ -6,8 +6,10 @@
 package org.jetbrains.kotlin.analysis.api.symbols.markers
 
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
-import org.jetbrains.kotlin.analysis.api.types.KtType
 
-public interface KtPossibleMemberSymbol : KtSymbol {
-    public val dispatchType: KtType?
-}
+/**
+ * A marker interface for symbols which could potentially be members of some class.
+ *
+ * @see org.jetbrains.kotlin.analysis.api.components.KtTypeProviderMixIn.getDispatchReceiverType
+ */
+public interface KtPossibleMemberSymbol : KtSymbol
diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt
index b29dc4edaee..596271da865 100644
--- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt
+++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /I.foo
-  dispatchType: A
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,4 +20,5 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt
index f8efd7f4906..ce2bf1d07e7 100644
--- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt
+++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /I2.bar
-  dispatchType: B
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,4 +20,5 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): B
   deprecationStatus: null
diff --git a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt
index 8ee0ee7803d..1c54be081e1 100644
--- a/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt
+++ b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt
@@ -14,7 +14,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /test
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -39,7 +38,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /testVal
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
index aa29e648865..08c8921b064 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.and
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -23,6 +22,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -30,7 +30,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -50,6 +49,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -57,7 +57,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -77,6 +76,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -84,7 +84,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -104,6 +103,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -111,7 +111,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -131,6 +130,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -138,7 +138,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -158,6 +157,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -165,7 +165,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.compareTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -185,6 +184,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -192,7 +192,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.dec
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -210,6 +209,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -217,7 +217,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -237,6 +236,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -244,7 +244,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -264,6 +263,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -271,7 +271,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -291,6 +290,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -298,7 +298,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -318,6 +317,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -325,7 +325,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -345,6 +344,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -352,7 +352,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.div
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -372,6 +371,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -379,7 +379,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.inc
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -397,6 +396,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -404,7 +404,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.inv
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -422,6 +421,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -429,7 +429,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -449,6 +448,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -456,7 +456,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -476,6 +475,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -483,7 +483,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -503,6 +502,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -510,7 +510,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -530,6 +529,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -537,7 +537,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -557,6 +556,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -564,7 +564,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.minus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -584,6 +583,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -591,7 +591,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.or
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -611,6 +610,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -618,7 +618,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -638,6 +637,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -645,7 +645,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -665,6 +664,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -672,7 +672,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -692,6 +691,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -699,7 +699,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -719,6 +718,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -726,7 +726,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -746,6 +745,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -753,7 +753,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.plus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -773,6 +772,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -780,7 +780,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.rangeTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -800,6 +799,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -807,7 +807,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.rangeTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -827,6 +826,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -834,7 +834,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.rangeTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -854,6 +853,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -861,7 +861,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.rangeTo
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -881,6 +880,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -893,7 +893,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -913,6 +912,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -925,7 +925,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -945,6 +944,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -957,7 +957,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -977,6 +976,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -989,7 +989,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1009,6 +1008,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1021,7 +1021,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1041,6 +1040,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1053,7 +1053,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1073,6 +1072,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1080,7 +1080,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.shl
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1100,6 +1099,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(bitCount)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1107,7 +1107,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.shr
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1127,6 +1126,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(bitCount)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1134,7 +1134,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1154,6 +1153,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1161,7 +1161,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1181,6 +1180,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1188,7 +1188,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1208,6 +1207,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1215,7 +1215,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1235,6 +1234,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1242,7 +1242,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1262,6 +1261,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1269,7 +1269,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.times
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1289,6 +1288,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1296,7 +1296,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toByte
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1314,6 +1313,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1321,7 +1321,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toChar
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1339,6 +1338,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1346,7 +1346,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toDouble
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1364,6 +1363,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1371,7 +1371,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toFloat
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1389,6 +1388,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1396,7 +1396,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toInt
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1414,6 +1413,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1421,7 +1421,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toLong
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1439,6 +1438,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1446,7 +1446,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.toShort
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1464,6 +1463,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1471,7 +1471,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.unaryMinus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1489,6 +1488,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1496,7 +1496,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.unaryPlus
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1514,6 +1513,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1521,7 +1521,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.ushr
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1541,6 +1540,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(bitCount)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1548,7 +1548,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Int.xor
-  dispatchType: kotlin/Int
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1568,6 +1567,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Int
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1575,7 +1575,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.equals
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1595,6 +1594,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1602,7 +1602,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.hashCode
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1620,6 +1619,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1627,7 +1627,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.toString
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -1645,6 +1644,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
@@ -1675,7 +1675,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: kotlin/Int
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1695,7 +1694,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: kotlin/Int
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -1705,4 +1703,4 @@ KtConstructorSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Private
-  deprecationStatus: null
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
index 2ca1137b6e1..803c8b5912d 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.add
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -23,6 +22,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -30,7 +30,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.add
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -51,6 +50,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -58,7 +58,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.addAll
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -79,6 +78,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -86,7 +86,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.addAll
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -106,6 +105,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -113,7 +113,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.clear
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -131,6 +130,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -138,7 +138,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -156,6 +155,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -163,7 +163,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -183,6 +182,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(index)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -190,7 +190,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.remove
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -210,6 +209,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -217,7 +217,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.removeAll
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -237,6 +236,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -244,7 +244,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.removeAt
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -264,6 +263,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(index)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -271,7 +271,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.retainAll
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -291,6 +290,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -298,7 +298,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.set
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -319,6 +318,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -326,7 +326,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.subList
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -347,6 +346,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(toIndex)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -354,7 +354,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.contains
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -374,6 +373,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -381,7 +381,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.containsAll
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -401,6 +400,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -408,7 +408,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.get
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -428,6 +427,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(index)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -435,7 +435,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.indexOf
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -455,6 +454,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -462,7 +462,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -480,6 +479,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -487,7 +487,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.iterator
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -505,6 +504,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -512,7 +512,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.lastIndexOf
-  dispatchType: kotlin/collections/MutableList<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -532,6 +531,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(element)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -539,7 +539,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/MutableList.size
-  dispatchType: kotlin/collections/MutableList<E>
   getter: null
   hasBackingField: false
   hasGetter: false
@@ -560,6 +559,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/MutableList<E>
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getSize
@@ -571,7 +571,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.equals
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -591,6 +590,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -598,7 +598,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.hashCode
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -616,6 +615,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -623,7 +623,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.toString
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -641,4 +640,5 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
index 3474497afd5..c569b783ee7 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
@@ -31,7 +31,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.hash32
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -49,6 +48,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: PackageVisibility
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtJavaFieldSymbol:
@@ -70,7 +70,6 @@ KtSyntheticJavaPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.length
-  dispatchType: java/lang/String
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -91,6 +90,7 @@ KtSyntheticJavaPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: length
@@ -102,7 +102,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.isEmpty
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -120,6 +119,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -127,7 +127,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.codePointAt
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -147,6 +146,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -154,7 +154,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.codePointBefore
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -174,6 +173,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -181,7 +181,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.codePointCount
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -202,6 +201,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -209,7 +209,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.offsetByCodePoints
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -230,6 +229,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -237,7 +237,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.getChars
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -258,6 +257,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: PackageVisibility
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -265,7 +265,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.getChars
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -288,6 +287,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p3)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -300,7 +300,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: java/lang/String.getBytes
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -323,6 +322,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p3)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
 
 KtFunctionSymbol:
@@ -330,7 +330,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.getBytes
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -350,6 +349,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -357,7 +357,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.getBytes
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -377,6 +376,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -384,7 +384,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.getBytes
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -402,6 +401,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -409,7 +409,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.equals
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -429,6 +428,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -436,7 +436,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.contentEquals
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -456,6 +455,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -463,7 +463,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.contentEquals
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -483,6 +482,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -490,7 +490,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.equalsIgnoreCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -510,6 +509,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -517,7 +517,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.compareTo
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -537,6 +536,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -544,7 +544,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.compareToIgnoreCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -564,6 +563,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -571,7 +571,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.regionMatches
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -594,6 +593,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p3)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -601,7 +601,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.regionMatches
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -625,6 +624,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p4)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -632,7 +632,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.startsWith
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -653,6 +652,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -660,7 +660,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.startsWith
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -680,6 +679,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -687,7 +687,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.endsWith
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -707,6 +706,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -714,7 +714,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.hashCode
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -732,6 +731,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -739,7 +739,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.indexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -759,6 +758,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -766,7 +766,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.indexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -787,6 +786,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -794,7 +794,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.indexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -814,6 +813,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -821,7 +821,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.indexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -842,6 +841,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -849,7 +849,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.indexOfSupplementary
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -870,6 +869,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Private
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -877,7 +877,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.lastIndexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -897,6 +896,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -904,7 +904,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.lastIndexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -925,6 +924,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -932,7 +932,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.lastIndexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -952,6 +951,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -959,7 +959,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.lastIndexOf
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -980,6 +979,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -987,7 +987,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.lastIndexOfSupplementary
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1008,6 +1007,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Private
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1015,7 +1015,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.substring
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1035,6 +1034,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1042,7 +1042,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.substring
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1063,6 +1062,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1070,7 +1070,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.subSequence
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1091,6 +1090,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1098,7 +1098,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.concat
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1118,6 +1117,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1125,7 +1125,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.replace
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1146,6 +1145,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1153,7 +1153,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.replace
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1174,6 +1173,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1181,7 +1181,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.matches
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1201,6 +1200,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1208,7 +1208,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.contains
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1228,6 +1227,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1235,7 +1235,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.replaceFirst
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1256,6 +1255,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1263,7 +1263,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.replaceAll
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1284,6 +1283,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1291,7 +1291,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.split
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1312,6 +1311,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p1)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1319,7 +1319,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.split
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1339,6 +1338,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1346,7 +1346,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toLowerCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1366,6 +1365,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1373,7 +1373,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toLowerCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1391,6 +1390,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1398,7 +1398,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toUpperCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1418,6 +1417,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1425,7 +1425,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toUpperCase
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1443,6 +1442,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1450,7 +1450,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.trim
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1468,6 +1467,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1475,7 +1475,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toString
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1493,6 +1492,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1500,7 +1500,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.toCharArray
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1518,6 +1517,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1525,7 +1525,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.intern
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1543,6 +1542,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -1550,7 +1550,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: java/lang/String.get
-  dispatchType: java/lang/String
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -1570,6 +1569,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p0)
   ]
   visibility: Public
+  getDispatchReceiver(): java/lang/String
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
@@ -1602,7 +1602,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1620,7 +1619,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1640,7 +1638,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1660,7 +1657,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1682,7 +1678,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1709,7 +1704,6 @@ KtConstructorSymbol:
   ]
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1737,7 +1731,6 @@ KtConstructorSymbol:
   ]
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1758,7 +1751,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1781,7 +1773,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1804,7 +1795,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1825,7 +1815,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1846,7 +1835,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1868,7 +1856,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1888,7 +1875,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1908,7 +1894,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1928,7 +1913,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1954,7 +1938,6 @@ KtConstructorSymbol:
   ]
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false
@@ -1968,4 +1951,4 @@ KtConstructorSymbol:
     KtValueParameterSymbol(p2)
   ]
   visibility: PackageVisibility
-  deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
+  deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=false, message=Deprecated in Java)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt
index f728006b08b..5b488f4d261 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Function2.invoke
-  dispatchType: kotlin/Function2<P1, P2, R>
   hasStableParameterNames: false
   isExtension: false
   isExternal: false
@@ -24,6 +23,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(p2)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Function2<P1, P2, R>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -31,7 +31,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.equals
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -51,6 +50,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -58,7 +58,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.hashCode
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -76,6 +75,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -83,7 +83,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.toString
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -101,4 +100,5 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt
index e14863aedc5..3bc738d5bda 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds
-  dispatchType: test/MyClass
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -27,6 +26,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(tT2)
   ]
   visibility: Public
+  getDispatchReceiver(): test/MyClass
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -34,7 +34,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds
-  dispatchType: test/MyClass
   getter: null
   hasBackingField: false
   hasGetter: false
@@ -55,6 +54,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): test/MyClass
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getPropWithOuterAndOwnGenericsAndBounds
@@ -66,7 +66,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.equals
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -86,6 +85,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(other)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -93,7 +93,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.hashCode
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -111,6 +110,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -118,7 +118,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/Any.toString
-  dispatchType: kotlin/Any
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -136,6 +135,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/Any
   deprecationStatus: null
 
 KtConstructorSymbol:
@@ -144,7 +144,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: test/MyClass
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt
index 2c7074b9c98..55b5a333aca 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/fileWalkDirectionEnum.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/listOf
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -37,7 +36,6 @@ KtFunctionSymbol:
       psi: null
   ]
   callableIdIfNonLocal: kotlin/collections/listOf
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -64,7 +62,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/listOf
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -86,4 +83,4 @@ KtFunctionSymbol:
     KtValueParameterSymbol(elements)
   ]
   visibility: Public
-  deprecationStatus: null
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt
index 5adb62800fe..51c4638646f 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/List.get
-  dispatchType: kotlin/collections/List<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -23,4 +22,5 @@ KtFunctionSymbol:
     KtValueParameterSymbol(index)
   ]
   visibility: Public
-  deprecationStatus: null
+  getDispatchReceiver(): kotlin/collections/List<E>
+  deprecationStatus: null
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt
index b33302df45a..f30ed2d00ca 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/List.listIterator
-  dispatchType: kotlin/collections/List<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,6 +20,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/List<E>
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -28,7 +28,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: kotlin/collections/List.listIterator
-  dispatchType: kotlin/collections/List<E>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -48,4 +47,5 @@ KtFunctionSymbol:
     KtValueParameterSymbol(index)
   ]
   visibility: Public
+  getDispatchReceiver(): kotlin/collections/List<E>
   deprecationStatus: null
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
index cb3b1a02509..d6cfe102319 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
@@ -32,7 +32,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Anno
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -79,7 +78,6 @@ KtFunctionSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /X.x
-  dispatchType: X
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -97,6 +95,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): X
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt
index 56d56dbad2d..f542578d7cb 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,6 +20,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): <no name provided>
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -28,7 +28,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: <no name provided>
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -49,6 +48,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): <no name provided>
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getData
@@ -73,7 +73,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
-  dispatchType: AnonymousContainer
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -94,6 +93,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): AnonymousContainer
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getAnonymousObject
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt
index 75e13c1336b..8955a148eca 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: <anonymous>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,6 +20,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): <anonymous>
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -28,7 +28,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: <anonymous>
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -49,6 +48,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): <anonymous>
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getData
@@ -73,7 +73,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /AnonymousContainer.anonymousObject
-  dispatchType: AnonymousContainer
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -94,6 +93,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): AnonymousContainer
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getAnonymousObject
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt
index 58fe9fcfc95..1fd10991979 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt
@@ -3,7 +3,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -37,7 +36,6 @@ KtPropertySetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -60,7 +58,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /p
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt
index 0caa60385e1..a6b3117c37b 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.i
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getI
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt
index 1508244cbf8..2f117bd12f9 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.a
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getA
@@ -35,7 +35,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.x
-  dispatchType: A
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -53,6 +52,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
index c55b8872934..ed393a2e8eb 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt
@@ -4,7 +4,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt
index c3a5d37a1ab..3b67e2e8057 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt
@@ -4,7 +4,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -36,7 +35,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: false
@@ -84,7 +82,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
index 36475fa5f5e..14551a1a7c9 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.descriptors.txt
@@ -46,7 +46,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: MyColor
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -100,7 +99,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.delegate
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -121,6 +119,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getDelegate
@@ -143,7 +142,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.lambda
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -164,6 +162,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getLambda
@@ -175,7 +174,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.nonLazy
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -196,6 +194,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getNonLazy
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
index 59d8c078a94..8ab0635b167 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt
@@ -46,7 +46,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: MyColor
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -100,7 +99,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.delegate
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -121,6 +119,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getDelegate
@@ -143,7 +142,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.lambda
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -164,6 +162,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getLambda
@@ -175,7 +174,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Some.nonLazy
-  dispatchType: Some
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -196,6 +194,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Some
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getNonLazy
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
index bd8130c6649..7b8b8b47a31 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
@@ -8,7 +8,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /i
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -40,7 +39,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -72,7 +70,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i3
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -104,7 +101,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i4
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -141,7 +137,6 @@ KtFunctionSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /f
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -198,7 +193,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.i2
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -219,6 +213,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
   getterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
   javaGetterName: getI2
@@ -235,7 +230,6 @@ KtFunctionSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.f2
-  dispatchType: Foo
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -253,6 +247,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
 
 KtNamedClassOrObjectSymbol:
@@ -287,7 +282,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -324,7 +318,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -356,7 +349,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /j2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
index 0416b758175..60ebce758c2 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
@@ -8,7 +8,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /i
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -40,7 +39,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -72,7 +70,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i3
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -104,7 +101,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /i4
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -141,7 +137,6 @@ KtFunctionSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /f
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -198,7 +193,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.i2
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -219,6 +213,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
   getterDeprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2)
   javaGetterName: getI2
@@ -235,7 +230,6 @@ KtFunctionSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.f2
-  dispatchType: Foo
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -253,6 +247,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: DeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use f2)
 
 KtNamedClassOrObjectSymbol:
@@ -287,7 +282,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -324,7 +318,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -361,7 +354,6 @@ KtKotlinPropertySymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j2
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
index df2227506d3..dd56ae3dfe9 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt
@@ -18,7 +18,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Style
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -37,7 +36,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: Style.SHEET
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -50,6 +48,7 @@ KtPropertyGetterSymbol:
   symbolKind: ACCESSOR
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): Style.SHEET
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -57,7 +56,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: Style.SHEET
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -78,6 +76,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Style.SHEET
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getExitAnimation
@@ -100,7 +99,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Style.exitAnimation
-  dispatchType: Style
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -121,6 +119,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Style
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getExitAnimation
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
index 46322883d6c..c28fa171586 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
@@ -18,7 +18,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Style
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: true
@@ -37,7 +36,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -57,7 +55,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: <anonymous>
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -78,6 +75,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): <anonymous>
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getExitAnimation
@@ -100,7 +98,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Style.exitAnimation
-  dispatchType: Style
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -121,6 +118,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Style
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getExitAnimation
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt
index a37e334233f..7ebaee451dc 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/extensionFunction.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /foo
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: true
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt
index dbecca778c7..c792ca87d8f 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt
@@ -14,7 +14,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /usage
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt
index 2366e7a11f5..3fc3723a9f2 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt
@@ -17,7 +17,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /foo
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt
index 4199236885d..03aedf84fb5 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt
@@ -27,7 +27,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /foo
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt
index c34695b62d2..6b2576793c4 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt
@@ -18,7 +18,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isPrimary: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt
index b18757af208..890ffd5eaf0 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturn.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /foo
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt
index 6a1d70df74e..01d1b3aaa1d 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt
@@ -125,7 +125,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /foo
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -164,7 +163,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /bar
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
index 4b48d7af133..595cc4418a7 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.i
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getMyI
@@ -40,7 +40,6 @@ KtPropertyGetterSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
-  dispatchType: Foo
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -53,6 +52,7 @@ KtPropertyGetterSymbol:
   symbolKind: ACCESSOR
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
 
 KtValueParameterSymbol:
@@ -79,7 +79,6 @@ KtPropertySetterSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
-  dispatchType: Foo
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -95,6 +94,7 @@ KtPropertySetterSymbol:
     KtValueParameterSymbol(value)
   ]
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -102,7 +102,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.j
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -123,6 +122,7 @@ KtKotlinPropertySymbol:
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getMyJ
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
index 8defd0ced77..c10a6f02129 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.i
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getMyI
@@ -40,7 +40,6 @@ KtPropertyGetterSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -79,7 +78,6 @@ KtPropertySetterSymbol:
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -102,7 +100,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /Foo.j
-  dispatchType: Foo
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -123,6 +120,7 @@ KtKotlinPropertySymbol:
   setter: KtPropertySetterSymbol(<setter>)
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): Foo
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getMyJ
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt
index 4292798b5e8..d98adc9b08f 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt
@@ -14,7 +14,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -61,7 +60,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /yyy
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt
index be8da2cadca..02a2b7ac341 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.x
-  dispatchType: A
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -21,6 +20,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
 
 KtFunctionSymbol:
@@ -28,7 +28,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.y
-  dispatchType: A
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -46,6 +45,7 @@ KtFunctionSymbol:
   typeParameters: []
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt
index cc1b5aeeace..f15b1267672 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.x
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getX
@@ -35,7 +35,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: A
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -48,6 +47,7 @@ KtPropertyGetterSymbol:
   symbolKind: ACCESSOR
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -55,7 +55,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.y
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -76,6 +75,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getY
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt
index a08aaf39169..d6176c3b224 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.x
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -24,6 +23,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getX
@@ -35,7 +35,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -55,7 +54,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /A.y
-  dispatchType: A
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
@@ -76,6 +74,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): A
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getY
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt
index c11056a6e6c..2b94a82e30c 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt
@@ -193,7 +193,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.foo
-  dispatchType: X<T>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -213,6 +212,7 @@ KtFunctionSymbol:
   ]
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): X<T>
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt
index 167adca0595..50bfad3461b 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt
@@ -193,7 +193,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.foo
-  dispatchType: X<T>
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -213,6 +212,7 @@ KtFunctionSymbol:
   ]
   valueParameters: []
   visibility: Public
+  getDispatchReceiver(): X<T>
   deprecationStatus: null
 
 KtNamedClassOrObjectSymbol:
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt
index 56d5fb05cf8..ace6af8f506 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelFunctions.txt
@@ -3,7 +3,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /x
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -28,7 +27,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /y
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt
index 8071423ad11..b9507d001e3 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /x
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -35,7 +34,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -55,7 +53,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /y
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt
index c59dcce6493..cc44a648ffc 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt
@@ -3,7 +3,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /x
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -35,7 +34,6 @@ KtPropertyGetterSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: null
-  dispatchType: null
   hasBody: true
   hasStableParameterNames: true
   isDefault: false
@@ -55,7 +53,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /y
-  dispatchType: null
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: false
   hasGetter: true
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
index d69c9178723..745dc8c5706 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
@@ -153,7 +153,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.f
-  dispatchType: X
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -173,6 +172,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(arg)
   ]
   visibility: Public
+  getDispatchReceiver(): X
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -183,7 +183,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.x
-  dispatchType: X
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -204,6 +203,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): X
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getX
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
index e084ad80647..d5dba5694b8 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
@@ -153,7 +153,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.f
-  dispatchType: X
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -173,6 +172,7 @@ KtFunctionSymbol:
     KtValueParameterSymbol(arg)
   ]
   visibility: Public
+  getDispatchReceiver(): X
   deprecationStatus: null
 
 KtKotlinPropertySymbol:
@@ -183,7 +183,6 @@ KtKotlinPropertySymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /X.x
-  dispatchType: X
   getter: KtPropertyGetterSymbol(<getter>)
   hasBackingField: true
   hasGetter: true
@@ -204,6 +203,7 @@ KtKotlinPropertySymbol:
   setter: null
   symbolKind: CLASS_MEMBER
   visibility: Public
+  getDispatchReceiver(): X
   deprecationStatus: null
   getterDeprecationStatus: null
   javaGetterName: getX
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt
index 4886df367f6..5f4bd01550e 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt
@@ -17,7 +17,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /primitive
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -58,7 +57,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /nullablePrimitive
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -99,7 +97,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /nonPrimitive
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
@@ -140,7 +137,6 @@ KtFunctionSymbol:
   annotationClassIds: []
   annotations: []
   callableIdIfNonLocal: /error
-  dispatchType: null
   hasStableParameterNames: true
   isExtension: false
   isExternal: false
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt
index c811ccbfe39..4f920b3a446 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt
@@ -4,7 +4,6 @@ KtConstructorSymbol:
   annotations: []
   callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/util/ArrayList
-  dispatchType: null
   hasStableParameterNames: false
   isExtension: false
   isPrimary: false