diff --git a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt
index df47a0a0e52..4c380eb4752 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt
@@ -99,6 +99,8 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri
             }
 
     private fun MemberScope.getSortedCallableDescriptors(): Collection<CallableMemberDescriptor> =
-            DescriptorUtils.getAllDescriptors(this).filterIsInstance<CallableMemberDescriptor>()
-                    .let { DescriptorSerializer.sort(it) }
+        DescriptorUtils.getAllDescriptors(this)
+            .filterIsInstance<CallableMemberDescriptor>()
+            .filter { it.kind != CallableMemberDescriptor.Kind.FAKE_OVERRIDE }
+            .let { DescriptorSerializer.sort(it) }
 }
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
index 8837c8915ff..ace996592a7 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
@@ -135,11 +135,10 @@ class DescriptorSerializer private constructor(
                 ?: sort(
                     DescriptorUtils.getAllDescriptors(classDescriptor.defaultType.memberScope)
                         .filterIsInstance<CallableMemberDescriptor>()
+                        .filter { it.kind != CallableMemberDescriptor.Kind.FAKE_OVERRIDE }
                 )
 
         for (descriptor in callableMembers) {
-            if (descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) continue
-
             when (descriptor) {
                 is PropertyDescriptor -> propertyProto(descriptor)?.let { builder.addProperty(it) }
                 is FunctionDescriptor -> functionProto(descriptor)?.let { builder.addFunction(it) }