diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IdSignature.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IdSignature.kt
index 40bf545ec63..b0fc158f962 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IdSignature.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IdSignature.kt
@@ -338,30 +338,8 @@ sealed class IdSignature {
         override fun hashCode(): Int = id
     }
 
-    // Used to reference local variable and value parameters in function
-    class GlobalScopeLocalDeclaration(val id: Int, val description: String = "<no description>", val filePath: String) : IdSignature() {
-        override val isPubliclyVisible: Boolean get() = false
-
-        override val hasTopLevel: Boolean get() = false
-
-        override fun topLevelSignature(): IdSignature = error("Is not supported for Local ID")
-
-        override fun nearestPublicSig(): IdSignature = error("Is not supported for Local ID")
-
-        override fun packageFqName(): FqName = error("Is not supported for Local ID")
-
-        override fun render(): String = "#$id from ${filePath.split('/').last()}"
-
-        override fun equals(other: Any?): Boolean =
-            other is GlobalScopeLocalDeclaration && id == other.id && filePath == other.filePath
-
-        private val hashCode = id * 31 + filePath.hashCode()
-
-        override fun hashCode(): Int = hashCode
-    }
-
     class LoweredDeclarationSignature(val original: IdSignature, val stage: Int, val index: Int) : IdSignature() {
-        override val isPubliclyVisible: Boolean get() = true
+        override val isPubliclyVisible: Boolean get() = original.isPubliclyVisible
 
         override val hasTopLevel: Boolean get() = true
 
diff --git a/compiler/ir/serialization.common/src/KotlinIr.proto b/compiler/ir/serialization.common/src/KotlinIr.proto
index 9f6928cb5a7..71c91bbb8fc 100644
--- a/compiler/ir/serialization.common/src/KotlinIr.proto
+++ b/compiler/ir/serialization.common/src/KotlinIr.proto
@@ -63,13 +63,8 @@ message LoweredIdSignature {
   required int32 index = 3;
 }
 
-message ScopeLocalIdSignature {
-  required int32 id = 1;
-  optional int32 file = 2;
-}
-
 message IdSignature {
-  oneof idsig {
+  oneof idSig {
     CommonIdSignature public_sig = 1;
     FileLocalIdSignature private_sig = 2;
     AccessorIdSignature accessor_sig = 3;
@@ -79,8 +74,7 @@ message IdSignature {
     FileSignature file_sig = 7;
 
     // JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
-    LoweredIdSignature ic_sig = 105;
-    ScopeLocalIdSignature external_scoped_local_sig = 107;
+    LoweredIdSignature ic_sig = 101;
   }
 }
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
index 08ef2a5b53d..5c0f8233dbe 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
@@ -115,7 +115,6 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.Loop as ProtoLoop
 import org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature as ProtoLoweredIdSignature
 import org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon as ProtoMemberAccessCommon
 import org.jetbrains.kotlin.backend.common.serialization.proto.NullableIrExpression as ProtoNullableIrExpression
-import org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature as ProtoScopeLocalIdSignature
 
 open class IrFileSerializer(
     val messageLogger: IrMessageLogger,
@@ -277,15 +276,6 @@ open class IrFileSerializer(
         return proto.build()
     }
 
-    private fun serializeScopeLocalSignature(signature: IdSignature.GlobalScopeLocalDeclaration): ProtoScopeLocalIdSignature {
-        val proto = ProtoScopeLocalIdSignature.newBuilder()
-
-        proto.id = signature.id
-        proto.file = serializeString(signature.filePath)
-
-        return proto.build()
-    }
-
     private fun serializeLoweredDeclarationSignature(signature: IdSignature.LoweredDeclarationSignature): ProtoLoweredIdSignature {
         val proto = ProtoLoweredIdSignature.newBuilder()
 
@@ -308,7 +298,6 @@ open class IrFileSerializer(
             is IdSignature.FileSignature -> proto.fileSig = serializeFileSignature(idSignature)
             // IR IC part
             is IdSignature.LoweredDeclarationSignature -> proto.icSig = serializeLoweredDeclarationSignature(idSignature)
-            is IdSignature.GlobalScopeLocalDeclaration -> proto.externalScopedLocalSig = serializeScopeLocalSignature(idSignature)
             is IdSignature.SpecialFakeOverrideSignature -> {}
         }
         return proto.build()
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrSymbolDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrSymbolDeserializer.kt
index 28ff166e8b1..4890f797ad0 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrSymbolDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrSymbolDeserializer.kt
@@ -7,12 +7,11 @@ package org.jetbrains.kotlin.backend.common.serialization
 
 import org.jetbrains.kotlin.backend.common.serialization.encodings.BinarySymbolData
 import org.jetbrains.kotlin.backend.common.serialization.proto.Actual
-import org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.IdsigCase.*
+import org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.IdSigCase.*
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ParameterDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrAnonymousInitializer
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
-import org.jetbrains.kotlin.ir.declarations.path
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.*
 import org.jetbrains.kotlin.ir.util.*
@@ -26,7 +25,6 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature as
 import org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature as ProtoIdSignature
 import org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature as ProtoLocalSignature
 import org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature as ProtoLoweredIdSignature
-import org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature as ProtoScopeLocalIdSignature
 
 class IrSymbolDeserializer(
     val symbolTable: ReferenceSymbolTable,
@@ -164,19 +162,7 @@ class IrSymbolDeserializer(
     }
 
     private fun deserializeScopeLocalIdSignature(proto: Int): IdSignature {
-        if (useGlobalSignatures) {
-            return IdSignature.GlobalScopeLocalDeclaration(proto, filePath = fileSymbol.owner.path)
-        } else {
-            return IdSignature.ScopeLocalDeclaration(proto)
-        }
-    }
-
-    private fun deserializeExternalScopeLocalIdSignature(proto: ProtoScopeLocalIdSignature): IdSignature {
-        if (useGlobalSignatures) {
-            return IdSignature.GlobalScopeLocalDeclaration(proto.id, filePath = fileReader.deserializeString(proto.file))
-        } else {
-            return IdSignature.ScopeLocalDeclaration(proto.id)
-        }
+        return IdSignature.ScopeLocalDeclaration(proto)
     }
 
     private fun deserializeLoweredDeclarationSignature(proto: ProtoLoweredIdSignature): IdSignature.LoweredDeclarationSignature {
@@ -200,7 +186,7 @@ class IrSymbolDeserializer(
     private fun deserializeFileIdSignature(proto: ProtoFileSignature): IdSignature.FileSignature = fileSignature
 
     fun deserializeSignatureData(proto: ProtoIdSignature): IdSignature {
-        return when (proto.idsigCase) {
+        return when (proto.idSigCase) {
             PUBLIC_SIG -> deserializePublicIdSignature(proto.publicSig)
             ACCESSOR_SIG -> deserializeAccessorIdSignature(proto.accessorSig)
             PRIVATE_SIG -> deserializeFileLocalIdSignature(proto.privateSig)
@@ -210,8 +196,7 @@ class IrSymbolDeserializer(
             FILE_SIG -> deserializeFileIdSignature(proto.fileSig)
             // IR IC part
             IC_SIG -> deserializeLoweredDeclarationSignature(proto.icSig)
-            EXTERNAL_SCOPED_LOCAL_SIG -> deserializeExternalScopeLocalIdSignature(proto.externalScopedLocalSig)
-            else -> error("Unexpected IdSignature kind: ${proto.idsigCase}")
+            else -> error("Unexpected IdSignature kind: ${proto.idSigCase}")
         }
     }
 }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java
index 149389e05d6..e3301e87b34 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java
@@ -55,111 +55,98 @@ public final class IdSignature extends
           }
           case 10: {
             org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.Builder subBuilder = null;
-            if (idsigCase_ == 1) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_).toBuilder();
+            if (idSigCase_ == 1) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 1;
+            idSigCase_ = 1;
             break;
           }
           case 18: {
             org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.Builder subBuilder = null;
-            if (idsigCase_ == 2) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_).toBuilder();
+            if (idSigCase_ == 2) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 2;
+            idSigCase_ = 2;
             break;
           }
           case 26: {
             org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.Builder subBuilder = null;
-            if (idsigCase_ == 3) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_).toBuilder();
+            if (idSigCase_ == 3) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 3;
+            idSigCase_ = 3;
             break;
           }
           case 32: {
-            idsigCase_ = 4;
-            idsig_ = input.readInt32();
+            idSigCase_ = 4;
+            idSig_ = input.readInt32();
             break;
           }
           case 42: {
             org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.Builder subBuilder = null;
-            if (idsigCase_ == 5) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_).toBuilder();
+            if (idSigCase_ == 5) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 5;
+            idSigCase_ = 5;
             break;
           }
           case 50: {
             org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.Builder subBuilder = null;
-            if (idsigCase_ == 6) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_).toBuilder();
+            if (idSigCase_ == 6) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 6;
+            idSigCase_ = 6;
             break;
           }
           case 58: {
             org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.Builder subBuilder = null;
-            if (idsigCase_ == 7) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_).toBuilder();
+            if (idSigCase_ == 7) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 7;
+            idSigCase_ = 7;
             break;
           }
-          case 842: {
+          case 810: {
             org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.Builder subBuilder = null;
-            if (idsigCase_ == 105) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_).toBuilder();
+            if (idSigCase_ == 101) {
+              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_).toBuilder();
             }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.PARSER, extensionRegistry);
+            idSig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.PARSER, extensionRegistry);
             if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
+              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_);
+              idSig_ = subBuilder.buildPartial();
             }
-            idsigCase_ = 105;
-            break;
-          }
-          case 858: {
-            org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.Builder subBuilder = null;
-            if (idsigCase_ == 107) {
-              subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_).toBuilder();
-            }
-            idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.PARSER, extensionRegistry);
-            if (subBuilder != null) {
-              subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_);
-              idsig_ = subBuilder.buildPartial();
-            }
-            idsigCase_ = 107;
+            idSigCase_ = 101;
             break;
           }
         }
@@ -196,9 +183,9 @@ public final class IdSignature extends
   }
 
   private int bitField0_;
-  private int idsigCase_ = 0;
-  private java.lang.Object idsig_;
-  public enum IdsigCase
+  private int idSigCase_ = 0;
+  private java.lang.Object idSig_;
+  public enum IdSigCase
       implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
     PUBLIC_SIG(1),
     PRIVATE_SIG(2),
@@ -207,14 +194,13 @@ public final class IdSignature extends
     COMPOSITE_SIG(5),
     LOCAL_SIG(6),
     FILE_SIG(7),
-    IC_SIG(105),
-    EXTERNAL_SCOPED_LOCAL_SIG(107),
+    IC_SIG(101),
     IDSIG_NOT_SET(0);
     private int value = 0;
-    private IdsigCase(int value) {
+    private IdSigCase(int value) {
       this.value = value;
     }
-    public static IdsigCase valueOf(int value) {
+    public static IdSigCase valueOf(int value) {
       switch (value) {
         case 1: return PUBLIC_SIG;
         case 2: return PRIVATE_SIG;
@@ -223,8 +209,7 @@ public final class IdSignature extends
         case 5: return COMPOSITE_SIG;
         case 6: return LOCAL_SIG;
         case 7: return FILE_SIG;
-        case 105: return IC_SIG;
-        case 107: return EXTERNAL_SCOPED_LOCAL_SIG;
+        case 101: return IC_SIG;
         case 0: return IDSIG_NOT_SET;
         default: throw new java.lang.IllegalArgumentException(
           "Value is undefined for this oneof enum.");
@@ -235,10 +220,10 @@ public final class IdSignature extends
     }
   };
 
-  public IdsigCase
-  getIdsigCase() {
-    return IdsigCase.valueOf(
-        idsigCase_);
+  public IdSigCase
+  getIdSigCase() {
+    return IdSigCase.valueOf(
+        idSigCase_);
   }
 
   public static final int PUBLIC_SIG_FIELD_NUMBER = 1;
@@ -246,14 +231,14 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
    */
   public boolean hasPublicSig() {
-    return idsigCase_ == 1;
+    return idSigCase_ == 1;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature getPublicSig() {
-    if (idsigCase_ == 1) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_;
+    if (idSigCase_ == 1) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.getDefaultInstance();
   }
@@ -263,14 +248,14 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
    */
   public boolean hasPrivateSig() {
-    return idsigCase_ == 2;
+    return idSigCase_ == 2;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature getPrivateSig() {
-    if (idsigCase_ == 2) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_;
+    if (idSigCase_ == 2) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance();
   }
@@ -280,14 +265,14 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
    */
   public boolean hasAccessorSig() {
-    return idsigCase_ == 3;
+    return idSigCase_ == 3;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature getAccessorSig() {
-    if (idsigCase_ == 3) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_;
+    if (idSigCase_ == 3) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.getDefaultInstance();
   }
@@ -297,14 +282,14 @@ public final class IdSignature extends
    * <code>optional int32 scoped_local_sig = 4;</code>
    */
   public boolean hasScopedLocalSig() {
-    return idsigCase_ == 4;
+    return idSigCase_ == 4;
   }
   /**
    * <code>optional int32 scoped_local_sig = 4;</code>
    */
   public int getScopedLocalSig() {
-    if (idsigCase_ == 4) {
-      return (java.lang.Integer) idsig_;
+    if (idSigCase_ == 4) {
+      return (java.lang.Integer) idSig_;
     }
     return 0;
   }
@@ -314,14 +299,14 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
    */
   public boolean hasCompositeSig() {
-    return idsigCase_ == 5;
+    return idSigCase_ == 5;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature getCompositeSig() {
-    if (idsigCase_ == 5) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_;
+    if (idSigCase_ == 5) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.getDefaultInstance();
   }
@@ -331,14 +316,14 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
    */
   public boolean hasLocalSig() {
-    return idsigCase_ == 6;
+    return idSigCase_ == 6;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature getLocalSig() {
-    if (idsigCase_ == 6) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_;
+    if (idSigCase_ == 6) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.getDefaultInstance();
   }
@@ -348,60 +333,43 @@ public final class IdSignature extends
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
    */
   public boolean hasFileSig() {
-    return idsigCase_ == 7;
+    return idSigCase_ == 7;
   }
   /**
    * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig() {
-    if (idsigCase_ == 7) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_;
+    if (idSigCase_ == 7) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance();
   }
 
-  public static final int IC_SIG_FIELD_NUMBER = 105;
+  public static final int IC_SIG_FIELD_NUMBER = 101;
   /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
    *
    * <pre>
    * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
    * </pre>
    */
   public boolean hasIcSig() {
-    return idsigCase_ == 105;
+    return idSigCase_ == 101;
   }
   /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
    *
    * <pre>
    * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
    * </pre>
    */
   public org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig() {
-    if (idsigCase_ == 105) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_;
+    if (idSigCase_ == 101) {
+       return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_;
     }
     return org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance();
   }
 
-  public static final int EXTERNAL_SCOPED_LOCAL_SIG_FIELD_NUMBER = 107;
-  /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-   */
-  public boolean hasExternalScopedLocalSig() {
-    return idsigCase_ == 107;
-  }
-  /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-   */
-  public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig() {
-    if (idsigCase_ == 107) {
-       return (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_;
-    }
-    return org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance();
-  }
-
   private void initFields() {
   }
   private byte memoizedIsInitialized = -1;
@@ -434,12 +402,6 @@ public final class IdSignature extends
         return false;
       }
     }
-    if (hasExternalScopedLocalSig()) {
-      if (!getExternalScopedLocalSig().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-    }
     memoizedIsInitialized = 1;
     return true;
   }
@@ -447,33 +409,30 @@ public final class IdSignature extends
   public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
-    if (idsigCase_ == 1) {
-      output.writeMessage(1, (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_);
+    if (idSigCase_ == 1) {
+      output.writeMessage(1, (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_);
     }
-    if (idsigCase_ == 2) {
-      output.writeMessage(2, (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_);
+    if (idSigCase_ == 2) {
+      output.writeMessage(2, (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_);
     }
-    if (idsigCase_ == 3) {
-      output.writeMessage(3, (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_);
+    if (idSigCase_ == 3) {
+      output.writeMessage(3, (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_);
     }
-    if (idsigCase_ == 4) {
+    if (idSigCase_ == 4) {
       output.writeInt32(
-          4, (int)((java.lang.Integer) idsig_));
+          4, (int)((java.lang.Integer) idSig_));
     }
-    if (idsigCase_ == 5) {
-      output.writeMessage(5, (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_);
+    if (idSigCase_ == 5) {
+      output.writeMessage(5, (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_);
     }
-    if (idsigCase_ == 6) {
-      output.writeMessage(6, (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_);
+    if (idSigCase_ == 6) {
+      output.writeMessage(6, (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_);
     }
-    if (idsigCase_ == 7) {
-      output.writeMessage(7, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_);
+    if (idSigCase_ == 7) {
+      output.writeMessage(7, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_);
     }
-    if (idsigCase_ == 105) {
-      output.writeMessage(105, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_);
-    }
-    if (idsigCase_ == 107) {
-      output.writeMessage(107, (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_);
+    if (idSigCase_ == 101) {
+      output.writeMessage(101, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_);
     }
     output.writeRawBytes(unknownFields);
   }
@@ -484,42 +443,38 @@ public final class IdSignature extends
     if (size != -1) return size;
 
     size = 0;
-    if (idsigCase_ == 1) {
+    if (idSigCase_ == 1) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(1, (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_);
+        .computeMessageSize(1, (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_);
     }
-    if (idsigCase_ == 2) {
+    if (idSigCase_ == 2) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(2, (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_);
+        .computeMessageSize(2, (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_);
     }
-    if (idsigCase_ == 3) {
+    if (idSigCase_ == 3) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(3, (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_);
+        .computeMessageSize(3, (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_);
     }
-    if (idsigCase_ == 4) {
+    if (idSigCase_ == 4) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
         .computeInt32Size(
-            4, (int)((java.lang.Integer) idsig_));
+            4, (int)((java.lang.Integer) idSig_));
     }
-    if (idsigCase_ == 5) {
+    if (idSigCase_ == 5) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(5, (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_);
+        .computeMessageSize(5, (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_);
     }
-    if (idsigCase_ == 6) {
+    if (idSigCase_ == 6) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(6, (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_);
+        .computeMessageSize(6, (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_);
     }
-    if (idsigCase_ == 7) {
+    if (idSigCase_ == 7) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(7, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_);
+        .computeMessageSize(7, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_);
     }
-    if (idsigCase_ == 105) {
+    if (idSigCase_ == 101) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(105, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_);
-    }
-    if (idsigCase_ == 107) {
-      size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(107, (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_);
+        .computeMessageSize(101, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_);
     }
     size += unknownFields.size();
     memoizedSerializedSize = size;
@@ -615,8 +570,8 @@ public final class IdSignature extends
 
     public Builder clear() {
       super.clear();
-      idsigCase_ = 0;
-      idsig_ = null;
+      idSigCase_ = 0;
+      idSig_ = null;
       return this;
     }
 
@@ -640,41 +595,38 @@ public final class IdSignature extends
       org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature result = new org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature(this);
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
-      if (idsigCase_ == 1) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 1) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 2) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 2) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 3) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 3) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 4) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 4) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 5) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 5) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 6) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 6) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 7) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 7) {
+        result.idSig_ = idSig_;
       }
-      if (idsigCase_ == 105) {
-        result.idsig_ = idsig_;
-      }
-      if (idsigCase_ == 107) {
-        result.idsig_ = idsig_;
+      if (idSigCase_ == 101) {
+        result.idSig_ = idSig_;
       }
       result.bitField0_ = to_bitField0_;
-      result.idsigCase_ = idsigCase_;
+      result.idSigCase_ = idSigCase_;
       return result;
     }
 
     public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature other) {
       if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance()) return this;
-      switch (other.getIdsigCase()) {
+      switch (other.getIdSigCase()) {
         case PUBLIC_SIG: {
           mergePublicSig(other.getPublicSig());
           break;
@@ -707,10 +659,6 @@ public final class IdSignature extends
           mergeIcSig(other.getIcSig());
           break;
         }
-        case EXTERNAL_SCOPED_LOCAL_SIG: {
-          mergeExternalScopedLocalSig(other.getExternalScopedLocalSig());
-          break;
-        }
         case IDSIG_NOT_SET: {
           break;
         }
@@ -745,12 +693,6 @@ public final class IdSignature extends
           return false;
         }
       }
-      if (hasExternalScopedLocalSig()) {
-        if (!getExternalScopedLocalSig().isInitialized()) {
-          
-          return false;
-        }
-      }
       return true;
     }
 
@@ -771,17 +713,17 @@ public final class IdSignature extends
       }
       return this;
     }
-    private int idsigCase_ = 0;
-    private java.lang.Object idsig_;
-    public IdsigCase
-        getIdsigCase() {
-      return IdsigCase.valueOf(
-          idsigCase_);
+    private int idSigCase_ = 0;
+    private java.lang.Object idSig_;
+    public IdSigCase
+        getIdSigCase() {
+      return IdSigCase.valueOf(
+          idSigCase_);
     }
 
-    public Builder clearIdsig() {
-      idsigCase_ = 0;
-      idsig_ = null;
+    public Builder clearIdSig() {
+      idSigCase_ = 0;
+      idSig_ = null;
       return this;
     }
 
@@ -791,14 +733,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
      */
     public boolean hasPublicSig() {
-      return idsigCase_ == 1;
+      return idSigCase_ == 1;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature getPublicSig() {
-      if (idsigCase_ == 1) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_;
+      if (idSigCase_ == 1) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.getDefaultInstance();
     }
@@ -809,9 +751,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 1;
+      idSigCase_ = 1;
       return this;
     }
     /**
@@ -819,33 +761,33 @@ public final class IdSignature extends
      */
     public Builder setPublicSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 1;
+      idSigCase_ = 1;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
      */
     public Builder mergePublicSig(org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature value) {
-      if (idsigCase_ == 1 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idsig_)
+      if (idSigCase_ == 1 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 1;
+      idSigCase_ = 1;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CommonIdSignature public_sig = 1;</code>
      */
     public Builder clearPublicSig() {
-      if (idsigCase_ == 1) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 1) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -855,14 +797,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
      */
     public boolean hasPrivateSig() {
-      return idsigCase_ == 2;
+      return idSigCase_ == 2;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature getPrivateSig() {
-      if (idsigCase_ == 2) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_;
+      if (idSigCase_ == 2) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance();
     }
@@ -873,9 +815,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 2;
+      idSigCase_ = 2;
       return this;
     }
     /**
@@ -883,33 +825,33 @@ public final class IdSignature extends
      */
     public Builder setPrivateSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 2;
+      idSigCase_ = 2;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
      */
     public Builder mergePrivateSig(org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature value) {
-      if (idsigCase_ == 2 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idsig_)
+      if (idSigCase_ == 2 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 2;
+      idSigCase_ = 2;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2;</code>
      */
     public Builder clearPrivateSig() {
-      if (idsigCase_ == 2) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 2) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -919,14 +861,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
      */
     public boolean hasAccessorSig() {
-      return idsigCase_ == 3;
+      return idSigCase_ == 3;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature getAccessorSig() {
-      if (idsigCase_ == 3) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_;
+      if (idSigCase_ == 3) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.getDefaultInstance();
     }
@@ -937,9 +879,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 3;
+      idSigCase_ = 3;
       return this;
     }
     /**
@@ -947,33 +889,33 @@ public final class IdSignature extends
      */
     public Builder setAccessorSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 3;
+      idSigCase_ = 3;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
      */
     public Builder mergeAccessorSig(org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature value) {
-      if (idsigCase_ == 3 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idsig_)
+      if (idSigCase_ == 3 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 3;
+      idSigCase_ = 3;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3;</code>
      */
     public Builder clearAccessorSig() {
-      if (idsigCase_ == 3) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 3) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -983,14 +925,14 @@ public final class IdSignature extends
      * <code>optional int32 scoped_local_sig = 4;</code>
      */
     public boolean hasScopedLocalSig() {
-      return idsigCase_ == 4;
+      return idSigCase_ == 4;
     }
     /**
      * <code>optional int32 scoped_local_sig = 4;</code>
      */
     public int getScopedLocalSig() {
-      if (idsigCase_ == 4) {
-        return (java.lang.Integer) idsig_;
+      if (idSigCase_ == 4) {
+        return (java.lang.Integer) idSig_;
       }
       return 0;
     }
@@ -998,8 +940,8 @@ public final class IdSignature extends
      * <code>optional int32 scoped_local_sig = 4;</code>
      */
     public Builder setScopedLocalSig(int value) {
-      idsigCase_ = 4;
-      idsig_ = value;
+      idSigCase_ = 4;
+      idSig_ = value;
       
       return this;
     }
@@ -1007,9 +949,9 @@ public final class IdSignature extends
      * <code>optional int32 scoped_local_sig = 4;</code>
      */
     public Builder clearScopedLocalSig() {
-      if (idsigCase_ == 4) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 4) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -1019,14 +961,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
      */
     public boolean hasCompositeSig() {
-      return idsigCase_ == 5;
+      return idSigCase_ == 5;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature getCompositeSig() {
-      if (idsigCase_ == 5) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_;
+      if (idSigCase_ == 5) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.getDefaultInstance();
     }
@@ -1037,9 +979,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 5;
+      idSigCase_ = 5;
       return this;
     }
     /**
@@ -1047,33 +989,33 @@ public final class IdSignature extends
      */
     public Builder setCompositeSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 5;
+      idSigCase_ = 5;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
      */
     public Builder mergeCompositeSig(org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature value) {
-      if (idsigCase_ == 5 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idsig_)
+      if (idSigCase_ == 5 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 5;
+      idSigCase_ = 5;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.CompositeSignature composite_sig = 5;</code>
      */
     public Builder clearCompositeSig() {
-      if (idsigCase_ == 5) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 5) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -1083,14 +1025,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
      */
     public boolean hasLocalSig() {
-      return idsigCase_ == 6;
+      return idSigCase_ == 6;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature getLocalSig() {
-      if (idsigCase_ == 6) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_;
+      if (idSigCase_ == 6) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.getDefaultInstance();
     }
@@ -1101,9 +1043,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 6;
+      idSigCase_ = 6;
       return this;
     }
     /**
@@ -1111,33 +1053,33 @@ public final class IdSignature extends
      */
     public Builder setLocalSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 6;
+      idSigCase_ = 6;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
      */
     public Builder mergeLocalSig(org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature value) {
-      if (idsigCase_ == 6 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idsig_)
+      if (idSigCase_ == 6 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 6;
+      idSigCase_ = 6;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LocalSignature local_sig = 6;</code>
      */
     public Builder clearLocalSig() {
-      if (idsigCase_ == 6) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 6) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
@@ -1147,14 +1089,14 @@ public final class IdSignature extends
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
      */
     public boolean hasFileSig() {
-      return idsigCase_ == 7;
+      return idSigCase_ == 7;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig() {
-      if (idsigCase_ == 7) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_;
+      if (idSigCase_ == 7) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance();
     }
@@ -1165,9 +1107,9 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 7;
+      idSigCase_ = 7;
       return this;
     }
     /**
@@ -1175,63 +1117,63 @@ public final class IdSignature extends
      */
     public Builder setFileSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 7;
+      idSigCase_ = 7;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
      */
     public Builder mergeFileSig(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature value) {
-      if (idsigCase_ == 7 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_)
+      if (idSigCase_ == 7 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 7;
+      idSigCase_ = 7;
       return this;
     }
     /**
      * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 7;</code>
      */
     public Builder clearFileSig() {
-      if (idsigCase_ == 7) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 7) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
     }
 
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
      * </pre>
      */
     public boolean hasIcSig() {
-      return idsigCase_ == 105;
+      return idSigCase_ == 101;
     }
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
      * </pre>
      */
     public org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig() {
-      if (idsigCase_ == 105) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_;
+      if (idSigCase_ == 101) {
+        return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_;
       }
       return org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance();
     }
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
@@ -1241,13 +1183,13 @@ public final class IdSignature extends
       if (value == null) {
         throw new NullPointerException();
       }
-      idsig_ = value;
+      idSig_ = value;
 
-      idsigCase_ = 105;
+      idSigCase_ = 101;
       return this;
     }
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
@@ -1255,105 +1197,41 @@ public final class IdSignature extends
      */
     public Builder setIcSig(
         org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
+      idSig_ = builderForValue.build();
 
-      idsigCase_ = 105;
+      idSigCase_ = 101;
       return this;
     }
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
      * </pre>
      */
     public Builder mergeIcSig(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature value) {
-      if (idsigCase_ == 105 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_)
+      if (idSigCase_ == 101 &&
+          idSig_ != org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance()) {
+        idSig_ = org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idSig_)
             .mergeFrom(value).buildPartial();
       } else {
-        idsig_ = value;
+        idSig_ = value;
       }
 
-      idsigCase_ = 105;
+      idSigCase_ = 101;
       return this;
     }
     /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
      *
      * <pre>
      * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
      * </pre>
      */
     public Builder clearIcSig() {
-      if (idsigCase_ == 105) {
-        idsigCase_ = 0;
-        idsig_ = null;
-        
-      }
-      return this;
-    }
-
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public boolean hasExternalScopedLocalSig() {
-      return idsigCase_ == 107;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig() {
-      if (idsigCase_ == 107) {
-        return (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_;
-      }
-      return org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance();
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public Builder setExternalScopedLocalSig(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      idsig_ = value;
-
-      idsigCase_ = 107;
-      return this;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public Builder setExternalScopedLocalSig(
-        org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.Builder builderForValue) {
-      idsig_ = builderForValue.build();
-
-      idsigCase_ = 107;
-      return this;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public Builder mergeExternalScopedLocalSig(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature value) {
-      if (idsigCase_ == 107 &&
-          idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance()) {
-        idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_)
-            .mergeFrom(value).buildPartial();
-      } else {
-        idsig_ = value;
-      }
-
-      idsigCase_ = 107;
-      return this;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-     */
-    public Builder clearExternalScopedLocalSig() {
-      if (idsigCase_ == 107) {
-        idsigCase_ = 0;
-        idsig_ = null;
+      if (idSigCase_ == 101) {
+        idSigCase_ = 0;
+        idSig_ = null;
         
       }
       return this;
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java
index 59ee5691d11..089f30de781 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java
@@ -71,7 +71,7 @@ public interface IdSignatureOrBuilder extends
   org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig();
 
   /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
    *
    * <pre>
    * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
@@ -79,20 +79,11 @@ public interface IdSignatureOrBuilder extends
    */
   boolean hasIcSig();
   /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105;</code>
+   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 101;</code>
    *
    * <pre>
    * JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations.
    * </pre>
    */
   org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig();
-
-  /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-   */
-  boolean hasExternalScopedLocalSig();
-  /**
-   * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107;</code>
-   */
-  org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig();
 }
\ No newline at end of file
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignature.java
deleted file mode 100644
index ba438d14270..00000000000
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignature.java
+++ /dev/null
@@ -1,420 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compiler/ir/serialization.common/src/KotlinIr.proto
-
-package org.jetbrains.kotlin.backend.common.serialization.proto;
-
-/**
- * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature}
- */
-public final class ScopeLocalIdSignature extends
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-    // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature)
-    ScopeLocalIdSignatureOrBuilder {
-  // Use ScopeLocalIdSignature.newBuilder() to construct.
-  private ScopeLocalIdSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
-    super(builder);
-    this.unknownFields = builder.getUnknownFields();
-  }
-  private ScopeLocalIdSignature(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
-
-  private static final ScopeLocalIdSignature defaultInstance;
-  public static ScopeLocalIdSignature getDefaultInstance() {
-    return defaultInstance;
-  }
-
-  public ScopeLocalIdSignature getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
-  private ScopeLocalIdSignature(
-      org.jetbrains.kotlin.protobuf.CodedInputStream input,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-    initFields();
-    int mutable_bitField0_ = 0;
-    org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
-        org.jetbrains.kotlin.protobuf.ByteString.newOutput();
-    org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
-        org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
-            unknownFieldsOutput, 1);
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownField(input, unknownFieldsCodedOutput,
-                                   extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-          case 8: {
-            bitField0_ |= 0x00000001;
-            id_ = input.readInt32();
-            break;
-          }
-          case 16: {
-            bitField0_ |= 0x00000002;
-            file_ = input.readInt32();
-            break;
-          }
-        }
-      }
-    } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
-          e.getMessage()).setUnfinishedMessage(this);
-    } finally {
-      try {
-        unknownFieldsCodedOutput.flush();
-      } catch (java.io.IOException e) {
-      // Should not happen
-      } finally {
-        unknownFields = unknownFieldsOutput.toByteString();
-      }
-      makeExtensionsImmutable();
-    }
-  }
-  public static org.jetbrains.kotlin.protobuf.Parser<ScopeLocalIdSignature> PARSER =
-      new org.jetbrains.kotlin.protobuf.AbstractParser<ScopeLocalIdSignature>() {
-    public ScopeLocalIdSignature parsePartialFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return new ScopeLocalIdSignature(input, extensionRegistry);
-    }
-  };
-
-  @java.lang.Override
-  public org.jetbrains.kotlin.protobuf.Parser<ScopeLocalIdSignature> getParserForType() {
-    return PARSER;
-  }
-
-  private int bitField0_;
-  public static final int ID_FIELD_NUMBER = 1;
-  private int id_;
-  /**
-   * <code>required int32 id = 1;</code>
-   */
-  public boolean hasId() {
-    return ((bitField0_ & 0x00000001) == 0x00000001);
-  }
-  /**
-   * <code>required int32 id = 1;</code>
-   */
-  public int getId() {
-    return id_;
-  }
-
-  public static final int FILE_FIELD_NUMBER = 2;
-  private int file_;
-  /**
-   * <code>optional int32 file = 2;</code>
-   */
-  public boolean hasFile() {
-    return ((bitField0_ & 0x00000002) == 0x00000002);
-  }
-  /**
-   * <code>optional int32 file = 2;</code>
-   */
-  public int getFile() {
-    return file_;
-  }
-
-  private void initFields() {
-    id_ = 0;
-    file_ = 0;
-  }
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    if (!hasId()) {
-      memoizedIsInitialized = 0;
-      return false;
-    }
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    getSerializedSize();
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
-      output.writeInt32(1, id_);
-    }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
-      output.writeInt32(2, file_);
-    }
-    output.writeRawBytes(unknownFields);
-  }
-
-  private int memoizedSerializedSize = -1;
-  public int getSerializedSize() {
-    int size = memoizedSerializedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    if (((bitField0_ & 0x00000001) == 0x00000001)) {
-      size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeInt32Size(1, id_);
-    }
-    if (((bitField0_ & 0x00000002) == 0x00000002)) {
-      size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeInt32Size(2, file_);
-    }
-    size += unknownFields.size();
-    memoizedSerializedSize = size;
-    return size;
-  }
-
-  private static final long serialVersionUID = 0L;
-  @java.lang.Override
-  protected java.lang.Object writeReplace()
-      throws java.io.ObjectStreamException {
-    return super.writeReplace();
-  }
-
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      org.jetbrains.kotlin.protobuf.ByteString data)
-      throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      org.jetbrains.kotlin.protobuf.ByteString data,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(byte[] data)
-      throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      byte[] data,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return PARSER.parseFrom(input);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      java.io.InputStream input,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseDelimitedFrom(
-      java.io.InputStream input,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return PARSER.parseDelimitedFrom(input, extensionRegistry);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      org.jetbrains.kotlin.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return PARSER.parseFrom(input);
-  }
-  public static org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parseFrom(
-      org.jetbrains.kotlin.protobuf.CodedInputStream input,
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return PARSER.parseFrom(input, extensionRegistry);
-  }
-
-  public static Builder newBuilder() { return Builder.create(); }
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature prototype) {
-    return newBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() { return newBuilder(this); }
-
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature}
-   */
-  public static final class Builder extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-        org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature, Builder>
-      implements
-      // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature)
-      org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignatureOrBuilder {
-    // Construct using org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private void maybeForceBuilderInitialization() {
-    }
-    private static Builder create() {
-      return new Builder();
-    }
-
-    public Builder clear() {
-      super.clear();
-      id_ = 0;
-      bitField0_ = (bitField0_ & ~0x00000001);
-      file_ = 0;
-      bitField0_ = (bitField0_ & ~0x00000002);
-      return this;
-    }
-
-    public Builder clone() {
-      return create().mergeFrom(buildPartial());
-    }
-
-    public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getDefaultInstanceForType() {
-      return org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance();
-    }
-
-    public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature build() {
-      org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature buildPartial() {
-      org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature result = new org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature(this);
-      int from_bitField0_ = bitField0_;
-      int to_bitField0_ = 0;
-      if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-        to_bitField0_ |= 0x00000001;
-      }
-      result.id_ = id_;
-      if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-        to_bitField0_ |= 0x00000002;
-      }
-      result.file_ = file_;
-      result.bitField0_ = to_bitField0_;
-      return result;
-    }
-
-    public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature other) {
-      if (other == org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance()) return this;
-      if (other.hasId()) {
-        setId(other.getId());
-      }
-      if (other.hasFile()) {
-        setFile(other.getFile());
-      }
-      setUnknownFields(
-          getUnknownFields().concat(other.unknownFields));
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      if (!hasId()) {
-        
-        return false;
-      }
-      return true;
-    }
-
-    public Builder mergeFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) e.getUnfinishedMessage();
-        throw e;
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    private int bitField0_;
-
-    private int id_ ;
-    /**
-     * <code>required int32 id = 1;</code>
-     */
-    public boolean hasId() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required int32 id = 1;</code>
-     */
-    public int getId() {
-      return id_;
-    }
-    /**
-     * <code>required int32 id = 1;</code>
-     */
-    public Builder setId(int value) {
-      bitField0_ |= 0x00000001;
-      id_ = value;
-      
-      return this;
-    }
-    /**
-     * <code>required int32 id = 1;</code>
-     */
-    public Builder clearId() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      id_ = 0;
-      
-      return this;
-    }
-
-    private int file_ ;
-    /**
-     * <code>optional int32 file = 2;</code>
-     */
-    public boolean hasFile() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>optional int32 file = 2;</code>
-     */
-    public int getFile() {
-      return file_;
-    }
-    /**
-     * <code>optional int32 file = 2;</code>
-     */
-    public Builder setFile(int value) {
-      bitField0_ |= 0x00000002;
-      file_ = value;
-      
-      return this;
-    }
-    /**
-     * <code>optional int32 file = 2;</code>
-     */
-    public Builder clearFile() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      file_ = 0;
-      
-      return this;
-    }
-
-    // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature)
-  }
-
-  static {
-    defaultInstance = new ScopeLocalIdSignature(true);
-    defaultInstance.initFields();
-  }
-
-  // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature)
-}
\ No newline at end of file
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignatureOrBuilder.java
deleted file mode 100644
index f8fdb4a8081..00000000000
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/ScopeLocalIdSignatureOrBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compiler/ir/serialization.common/src/KotlinIr.proto
-
-package org.jetbrains.kotlin.backend.common.serialization.proto;
-
-public interface ScopeLocalIdSignatureOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature)
-    org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
-
-  /**
-   * <code>required int32 id = 1;</code>
-   */
-  boolean hasId();
-  /**
-   * <code>required int32 id = 1;</code>
-   */
-  int getId();
-
-  /**
-   * <code>optional int32 file = 2;</code>
-   */
-  boolean hasFile();
-  /**
-   * <code>optional int32 file = 2;</code>
-   */
-  int getFile();
-}
\ No newline at end of file