diff --git a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingModeExtensions.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingModeExtensions.kt
index 81d5cd3692d..5b45206f446 100644
--- a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingModeExtensions.kt
+++ b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingModeExtensions.kt
@@ -9,26 +9,23 @@ import org.jetbrains.kotlin.types.TypeSystemCommonBackendContext
 import org.jetbrains.kotlin.types.model.KotlinTypeMarker
 
 fun TypeSystemCommonBackendContext.getOptimalModeForValueParameter(
-    type: KotlinTypeMarker,
-    isForUast: Boolean = false,
-): TypeMappingMode = getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = true, isForUast)
+    type: KotlinTypeMarker
+): TypeMappingMode = getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = true)
 
 fun TypeSystemCommonBackendContext.getOptimalModeForReturnType(
     type: KotlinTypeMarker,
-    isAnnotationMethod: Boolean,
-    isForUast: Boolean = false,
+    isAnnotationMethod: Boolean
 ): TypeMappingMode {
     return if (isAnnotationMethod)
         TypeMappingMode.VALUE_FOR_ANNOTATION
     else
-        getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = false, isForUast)
+        getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = false)
 }
 
 @OptIn(TypeMappingModeInternals::class)
 private fun TypeSystemCommonBackendContext.getOptimalModeForSignaturePart(
     type: KotlinTypeMarker,
-    canBeUsedInSupertypePosition: Boolean,
-    isForUast: Boolean = false,
+    canBeUsedInSupertypePosition: Boolean
 ): TypeMappingMode {
     if (type.argumentsCount() == 0) return TypeMappingMode.DEFAULT
 
@@ -36,7 +33,7 @@ private fun TypeSystemCommonBackendContext.getOptimalModeForSignaturePart(
     if (isInlineClassType && shouldUseUnderlyingType(type)) {
         val underlyingType = computeUnderlyingType(type)
         if (underlyingType != null) {
-            return getOptimalModeForSignaturePart(underlyingType, canBeUsedInSupertypePosition, isForUast).dontWrapInlineClassesMode()
+            return getOptimalModeForSignaturePart(underlyingType, canBeUsedInSupertypePosition).dontWrapInlineClassesMode()
         }
     }
 
@@ -48,17 +45,15 @@ private fun TypeSystemCommonBackendContext.getOptimalModeForSignaturePart(
 
     val invariantArgumentMode =
         if (canBeUsedInSupertypePosition)
-            getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = false, isForUast)
+            getOptimalModeForSignaturePart(type, canBeUsedInSupertypePosition = false)
         else
             null
 
     return TypeMappingMode(
         skipDeclarationSiteWildcards = !canBeUsedInSupertypePosition,
         skipDeclarationSiteWildcardsIfPossible = true,
-        genericArgumentMode = if (isForUast) TypeMappingMode.GENERIC_ARGUMENT_UAST else null,
         genericContravariantArgumentMode = contravariantArgumentMode,
         genericInvariantArgumentMode = invariantArgumentMode,
-        needInlineClassWrapping = !isInlineClassType,
-        mapTypeAliases = isForUast
+        needInlineClassWrapping = !isInlineClassType
     )
 }
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt
index f9eeed54d80..05168196973 100644
--- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt
@@ -142,4 +142,20 @@ class TypeMappingMode @TypeMappingModeInternals constructor(
             needPrimitiveBoxing, false, isForAnnotationParameter, skipDeclarationSiteWildcards, skipDeclarationSiteWildcardsIfPossible,
             genericArgumentMode, kotlinCollectionsToJavaCollections, genericContravariantArgumentMode, genericInvariantArgumentMode
         )
+
+    fun mapTypeAliases(
+        genericArgumentMode: TypeMappingMode? = null
+    ): TypeMappingMode =
+        TypeMappingMode(
+            needPrimitiveBoxing,
+            needInlineClassWrapping,
+            isForAnnotationParameter,
+            skipDeclarationSiteWildcards,
+            skipDeclarationSiteWildcardsIfPossible,
+            genericArgumentMode ?: this.genericArgumentMode,
+            kotlinCollectionsToJavaCollections,
+            genericContravariantArgumentMode,
+            genericInvariantArgumentMode,
+            mapTypeAliases = true
+        )
 }