diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
index 371ef02abc2..fef2e8c210c 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
@@ -74,7 +74,7 @@ public final class DebugExtOptionsProtoBuf {
       ":<\n\023fq_name_id_in_table\022\035.google.protobu" +
       "f.FieldOptions\030\322\206\003 \001(\010:;\n\022string_id_in_t" +
       "able\022\035.google.protobuf.FieldOptions\030\323\206\003 " +
-      "\001(\010B\034B\027DebugExtOptionsProtoBuf\210\001\000"
+      "\001(\010B\031B\027DebugExtOptionsProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index d88421516a2..fe2dc1e1c95 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -24463,8 +24463,8 @@ public final class DebugProtoBuf {
       "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIV" +
       "ATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberKind\022\017" +
       "\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016\n\nDE" +
-      "LEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022B\rDebugProt" +
-      "oBuf\210\001\000"
+      "LEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\017B\rDebugProt" +
+      "oBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index c50c86e3230..85d3dd98f4c 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -19,8 +19,7 @@ package org.jetbrains.kotlin.serialization;
 import "core/deserialization/src/ext_options.proto";
 
 option java_outer_classname = "ProtoBuf";
-option optimize_for = LITE_RUNTIME; // Smaller runtime
-option java_generic_services = false; // Less code
+option optimize_for = LITE_RUNTIME;
 
 message StringTable {
   repeated string string = 1;
diff --git a/core/deserialization/src/ext_options.proto b/core/deserialization/src/ext_options.proto
index a7827be34c7..9eda441d28b 100644
--- a/core/deserialization/src/ext_options.proto
+++ b/core/deserialization/src/ext_options.proto
@@ -1,9 +1,24 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.jetbrains.kotlin.serialization;
 
 import "google/protobuf/descriptor.proto";
 
 option java_outer_classname = "ExtOptionsProtoBuf";
-option java_generic_services = false; // Less code
 
 extend google.protobuf.FieldOptions {
   optional bool skip_in_comparison = 50000;