diff --git a/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class b/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class
index e3d1dc80028..c49d1ffbcb5 100644
Binary files a/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class and b/compiler/frontend/builtins/jet/InlineStrategy.kotlin_class differ
diff --git a/compiler/frontend/serialization/src/descriptors.proto b/compiler/frontend/serialization/src/descriptors.proto
index cc994c93291..ed1633ba6a8 100644
--- a/compiler/frontend/serialization/src/descriptors.proto
+++ b/compiler/frontend/serialization/src/descriptors.proto
@@ -125,7 +125,6 @@ message Class {
   // we store only names, because the actual information must reside in the corresponding .class files,
   // to be obtainable through reflection at runtime
   repeated int32 nested_class_name = 7;
-  repeated int32 nested_object_name = 8;
 
   repeated Callable member = 11;
 
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
index 95873561694..a105b0aff30 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
@@ -4431,20 +4431,6 @@ public final class ProtoBuf {
      */
     int getNestedClassName(int index);
 
-    // repeated int32 nested_object_name = 8;
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    java.util.List<java.lang.Integer> getNestedObjectNameList();
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    int getNestedObjectNameCount();
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    int getNestedObjectName(int index);
-
     // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
     /**
      * <code>repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;</code>
@@ -4600,39 +4586,18 @@ public final class ProtoBuf {
               input.popLimit(limit);
               break;
             }
-            case 64: {
-              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                nestedObjectName_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000080;
-              }
-              nestedObjectName_.add(input.readInt32());
-              break;
-            }
-            case 66: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080) && input.getBytesUntilLimit() > 0) {
-                nestedObjectName_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000080;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                nestedObjectName_.add(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
             case 90: {
-              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
                 member_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00000100;
+                mutable_bitField0_ |= 0x00000080;
               }
               member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
               break;
             }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000200;
+                mutable_bitField0_ |= 0x00000100;
               }
               enumEntry_.add(input.readInt32());
               break;
@@ -4640,9 +4605,9 @@ public final class ProtoBuf {
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100) && input.getBytesUntilLimit() > 0) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000200;
+                mutable_bitField0_ |= 0x00000100;
               }
               while (input.getBytesUntilLimit() > 0) {
                 enumEntry_.add(input.readInt32());
@@ -4681,12 +4646,9 @@ public final class ProtoBuf {
           nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
         }
         if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-          nestedObjectName_ = java.util.Collections.unmodifiableList(nestedObjectName_);
-        }
-        if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
           member_ = java.util.Collections.unmodifiableList(member_);
         }
-        if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+        if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
           enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
         }
         makeExtensionsImmutable();
@@ -5918,29 +5880,6 @@ public final class ProtoBuf {
       return nestedClassName_.get(index);
     }
 
-    // repeated int32 nested_object_name = 8;
-    public static final int NESTED_OBJECT_NAME_FIELD_NUMBER = 8;
-    private java.util.List<java.lang.Integer> nestedObjectName_;
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    public java.util.List<java.lang.Integer>
-        getNestedObjectNameList() {
-      return nestedObjectName_;
-    }
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    public int getNestedObjectNameCount() {
-      return nestedObjectName_.size();
-    }
-    /**
-     * <code>repeated int32 nested_object_name = 8;</code>
-     */
-    public int getNestedObjectName(int index) {
-      return nestedObjectName_.get(index);
-    }
-
     // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
     public static final int MEMBER_FIELD_NUMBER = 11;
     private java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable> member_;
@@ -6032,7 +5971,6 @@ public final class ProtoBuf {
       typeParameter_ = java.util.Collections.emptyList();
       supertype_ = java.util.Collections.emptyList();
       nestedClassName_ = java.util.Collections.emptyList();
-      nestedObjectName_ = java.util.Collections.emptyList();
       member_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
       primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
@@ -6104,9 +6042,6 @@ public final class ProtoBuf {
       for (int i = 0; i < nestedClassName_.size(); i++) {
         output.writeInt32(7, nestedClassName_.get(i));
       }
-      for (int i = 0; i < nestedObjectName_.size(); i++) {
-        output.writeInt32(8, nestedObjectName_.get(i));
-      }
       for (int i = 0; i < member_.size(); i++) {
         output.writeMessage(11, member_.get(i));
       }
@@ -6157,15 +6092,6 @@ public final class ProtoBuf {
         size += dataSize;
         size += 1 * getNestedClassNameList().size();
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < nestedObjectName_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(nestedObjectName_.get(i));
-        }
-        size += dataSize;
-        size += 1 * getNestedObjectNameList().size();
-      }
       for (int i = 0; i < member_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(11, member_.get(i));
@@ -6288,14 +6214,12 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000020);
         nestedClassName_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000040);
-        nestedObjectName_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
         member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
+        bitField0_ = (bitField0_ & ~0x00000080);
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
+        bitField0_ = (bitField0_ & ~0x00000100);
         primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-        bitField0_ = (bitField0_ & ~0x00000400);
+        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
@@ -6351,21 +6275,16 @@ public final class ProtoBuf {
         }
         result.nestedClassName_ = nestedClassName_;
         if (((bitField0_ & 0x00000080) == 0x00000080)) {
-          nestedObjectName_ = java.util.Collections.unmodifiableList(nestedObjectName_);
+          member_ = java.util.Collections.unmodifiableList(member_);
           bitField0_ = (bitField0_ & ~0x00000080);
         }
-        result.nestedObjectName_ = nestedObjectName_;
+        result.member_ = member_;
         if (((bitField0_ & 0x00000100) == 0x00000100)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
+          enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
           bitField0_ = (bitField0_ & ~0x00000100);
         }
-        result.member_ = member_;
-        if (((bitField0_ & 0x00000200) == 0x00000200)) {
-          enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
-          bitField0_ = (bitField0_ & ~0x00000200);
-        }
         result.enumEntry_ = enumEntry_;
-        if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
+        if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
           to_bitField0_ |= 0x00000010;
         }
         result.primaryConstructor_ = primaryConstructor_;
@@ -6418,21 +6337,11 @@ public final class ProtoBuf {
             nestedClassName_.addAll(other.nestedClassName_);
           }
           
-        }
-        if (!other.nestedObjectName_.isEmpty()) {
-          if (nestedObjectName_.isEmpty()) {
-            nestedObjectName_ = other.nestedObjectName_;
-            bitField0_ = (bitField0_ & ~0x00000080);
-          } else {
-            ensureNestedObjectNameIsMutable();
-            nestedObjectName_.addAll(other.nestedObjectName_);
-          }
-          
         }
         if (!other.member_.isEmpty()) {
           if (member_.isEmpty()) {
             member_ = other.member_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+            bitField0_ = (bitField0_ & ~0x00000080);
           } else {
             ensureMemberIsMutable();
             member_.addAll(other.member_);
@@ -6442,7 +6351,7 @@ public final class ProtoBuf {
         if (!other.enumEntry_.isEmpty()) {
           if (enumEntry_.isEmpty()) {
             enumEntry_ = other.enumEntry_;
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000100);
           } else {
             ensureEnumEntryIsMutable();
             enumEntry_.addAll(other.enumEntry_);
@@ -7148,79 +7057,13 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated int32 nested_object_name = 8;
-      private java.util.List<java.lang.Integer> nestedObjectName_ = java.util.Collections.emptyList();
-      private void ensureNestedObjectNameIsMutable() {
-        if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          nestedObjectName_ = new java.util.ArrayList<java.lang.Integer>(nestedObjectName_);
-          bitField0_ |= 0x00000080;
-         }
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public java.util.List<java.lang.Integer>
-          getNestedObjectNameList() {
-        return java.util.Collections.unmodifiableList(nestedObjectName_);
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public int getNestedObjectNameCount() {
-        return nestedObjectName_.size();
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public int getNestedObjectName(int index) {
-        return nestedObjectName_.get(index);
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public Builder setNestedObjectName(
-          int index, int value) {
-        ensureNestedObjectNameIsMutable();
-        nestedObjectName_.set(index, value);
-        
-        return this;
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public Builder addNestedObjectName(int value) {
-        ensureNestedObjectNameIsMutable();
-        nestedObjectName_.add(value);
-        
-        return this;
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public Builder addAllNestedObjectName(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureNestedObjectNameIsMutable();
-        super.addAll(values, nestedObjectName_);
-        
-        return this;
-      }
-      /**
-       * <code>repeated int32 nested_object_name = 8;</code>
-       */
-      public Builder clearNestedObjectName() {
-        nestedObjectName_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
-        
-        return this;
-      }
-
       // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
       private java.util.List<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable> member_ =
         java.util.Collections.emptyList();
       private void ensureMemberIsMutable() {
-        if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+        if (!((bitField0_ & 0x00000080) == 0x00000080)) {
           member_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable>(member_);
-          bitField0_ |= 0x00000100;
+          bitField0_ |= 0x00000080;
          }
       }
 
@@ -7325,7 +7168,7 @@ public final class ProtoBuf {
        */
       public Builder clearMember() {
         member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
+        bitField0_ = (bitField0_ & ~0x00000080);
 
         return this;
       }
@@ -7342,9 +7185,9 @@ public final class ProtoBuf {
       // repeated int32 enum_entry = 12;
       private java.util.List<java.lang.Integer> enumEntry_ = java.util.Collections.emptyList();
       private void ensureEnumEntryIsMutable() {
-        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
+        if (!((bitField0_ & 0x00000100) == 0x00000100)) {
           enumEntry_ = new java.util.ArrayList<java.lang.Integer>(enumEntry_);
-          bitField0_ |= 0x00000200;
+          bitField0_ |= 0x00000100;
          }
       }
       /**
@@ -7400,7 +7243,7 @@ public final class ProtoBuf {
        */
       public Builder clearEnumEntry() {
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
+        bitField0_ = (bitField0_ & ~0x00000100);
         
         return this;
       }
@@ -7415,7 +7258,7 @@ public final class ProtoBuf {
        * </pre>
        */
       public boolean hasPrimaryConstructor() {
-        return ((bitField0_ & 0x00000400) == 0x00000400);
+        return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
        * <code>optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
@@ -7440,7 +7283,7 @@ public final class ProtoBuf {
         }
         primaryConstructor_ = value;
 
-        bitField0_ |= 0x00000400;
+        bitField0_ |= 0x00000200;
         return this;
       }
       /**
@@ -7454,7 +7297,7 @@ public final class ProtoBuf {
           org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
         primaryConstructor_ = builderForValue.build();
 
-        bitField0_ |= 0x00000400;
+        bitField0_ |= 0x00000200;
         return this;
       }
       /**
@@ -7465,7 +7308,7 @@ public final class ProtoBuf {
        * </pre>
        */
       public Builder mergePrimaryConstructor(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor value) {
-        if (((bitField0_ & 0x00000400) == 0x00000400) &&
+        if (((bitField0_ & 0x00000200) == 0x00000200) &&
             primaryConstructor_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
           primaryConstructor_ =
             org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
@@ -7473,7 +7316,7 @@ public final class ProtoBuf {
           primaryConstructor_ = value;
         }
 
-        bitField0_ |= 0x00000400;
+        bitField0_ |= 0x00000200;
         return this;
       }
       /**
@@ -7486,7 +7329,7 @@ public final class ProtoBuf {
       public Builder clearPrimaryConstructor() {
         primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
 
-        bitField0_ = (bitField0_ & ~0x00000400);
+        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }