diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 89662512950..63f80b62e38 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -44,8 +44,6 @@ import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.name.FqNameUnsafe;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
@@ -253,8 +251,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
     @Override
     protected void generateKotlinAnnotation() {
-        if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
-
         if (!isTopLevelOrInnerClass(descriptor)) {
             AnnotationVisitor av = v.getVisitor().visitAnnotation(
                     asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_LOCAL_CLASS), true
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 717953fc5fa..dcd727ec58a 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -117,7 +117,9 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
 
         generateSyntheticParts();
 
-        generateKotlinAnnotation();
+        if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
+            generateKotlinAnnotation();
+        }
 
         done();
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
index b3c69834536..c355efb4424 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
@@ -69,10 +69,6 @@ public class MultifileClassPartCodegen(
     }
 
     override fun generateKotlinAnnotation() {
-        if (state.classBuilderMode != ClassBuilderMode.FULL) {
-            return
-        }
-
         val members = ArrayList<DeclarationDescriptor>()
         for (declaration in element.declarations) {
             when (declaration) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
index 5a283b36398..8465f9d1c7e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
@@ -107,10 +107,6 @@ public class PackagePartCodegen extends MemberCodegen<JetFile> {
 
     @Override
     protected void generateKotlinAnnotation() {
-        if (state.getClassBuilderMode() != ClassBuilderMode.FULL) {
-            return;
-        }
-
         List<DeclarationDescriptor> members = new ArrayList<DeclarationDescriptor>();
         for (JetDeclaration declaration : element.getDeclarations()) {
             if (declaration instanceof JetNamedFunction) {
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
index 86771672dda..c244cb91ca6 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
@@ -10,7 +10,6 @@ public interface Generic <N, NN> {
     @org.jetbrains.annotations.Nullable
     NN b1(@org.jetbrains.annotations.Nullable NN nn);
 
-    @kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
     static final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
index cbfcae60bff..c6d2f74b16f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
@@ -41,7 +41,6 @@ public interface Primitives {
 
     double getDouble();
 
-    @kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
     static final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
index 45f39d0c405..2f44384c4ba 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
@@ -1,5 +1,4 @@
 public interface PrivateInTrait {
-    @kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
     static final class DefaultImpls {
         @org.jetbrains.annotations.NotNull
         static java.lang.String getNn(PrivateInTrait $this) { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
index ab7bbc78305..f689dd4a2d7 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
@@ -35,7 +35,6 @@ public interface Trait {
 
     void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
 
-    @kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
     static final class DefaultImpls {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
index 6aef8bf2be0..5302cf17afd 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
@@ -16,7 +16,6 @@ public interface TraitClassObjectField {
         private Companion() { /* compiled code */ }
     }
 
-    @kotlin.jvm.internal.KotlinSyntheticClass(version = {0, 27, 0}, abiVersion = 27)
     static final class DefaultImpls {
     }
 }
\ No newline at end of file