diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt
index 5d7f4c49489..c1951ee9815 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/IrDescriptorDeserializer.kt
@@ -121,14 +121,13 @@ internal fun DeserializedSimpleFunctionDescriptor.nameResolver(): NameResolver {
 // Kotlin descriptors and types for IR.
 
 internal class IrDescriptorDeserializer(val context: Context, 
-    val deserializationDescriptorIndex: IrDeserializationDescriptorIndex,
     val rootFunction: DeserializedSimpleFunctionDescriptor,
     val localDeserializer: LocalDeclarationDeserializer) {
 
     val loopIndex = mutableMapOf<Int, IrLoop>()
     val nameResolver = rootFunction.nameResolver() as NameResolverImpl
     val nameTable = rootFunction.nameTable()
-    val descriptorIndex = deserializationDescriptorIndex.map
+    val descriptorIndex = IrDeserializationDescriptorIndex(context.irBuiltIns).map
 
     fun deserializeKotlinType(proto: KonanIr.KotlinType): KotlinType {
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt
index 6eeafa5712d..b5af8523be9 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializeIr.kt
@@ -562,7 +562,6 @@ internal class IrSerializer(val context: Context,
 // --------- Deserializer part -----------------------------
 
 internal class IrDeserializer(val context: Context, 
-    val descriptorIndex: IrDeserializationDescriptorIndex,
     val rootFunction: DeserializedSimpleFunctionDescriptor) {
 
     val loopIndex = mutableMapOf<Int, IrLoop>()
@@ -570,7 +569,7 @@ internal class IrDeserializer(val context: Context,
     val localDeserializer = LocalDeclarationDeserializer(rootFunction, context.moduleDescriptor)
 
     val descriptorDeserializer = IrDescriptorDeserializer(
-        context, descriptorIndex, rootFunction, localDeserializer)
+        context, rootFunction, localDeserializer)
 
 
     fun deserializeKotlinType(proto: KonanIr.KotlinType) 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializerVisitor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializerVisitor.kt
index ba337fd58ff..892baef6ebc 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializerVisitor.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/SerializerVisitor.kt
@@ -41,8 +41,6 @@ import org.jetbrains.kotlin.backend.common.validateIrFunction
 
 internal class DeserializerDriver(val context: Context) {
 
-    val descriptorIndex = IrDeserializationDescriptorIndex(context.irBuiltIns) 
-
     internal fun deserializeInlineBody(descriptor: FunctionDescriptor): IrDeclaration? {
         if (!descriptor.needsInlining) return null
 
@@ -54,7 +52,7 @@ internal class DeserializerDriver(val context: Context) {
         PhaseManager(context).phase(KonanPhase.DESERIALIZER) {
             context.log("### IR deserialization attempt:\t$descriptor")
             try {
-                deserializedIr = IrDeserializer(context, descriptorIndex, descriptor).decodeDeclaration()
+                deserializedIr = IrDeserializer(context, descriptor).decodeDeclaration()
                 context.log("${deserializedIr!!.descriptor}")
                 context.log(ir2stringWhole(deserializedIr!!))
                 context.log("IR deserialization SUCCESS:\t$descriptor")
@@ -84,7 +82,6 @@ internal class DeserializerDriver(val context: Context) {
             }
 
             return true
-
         }
     }
 }