diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
index 3d7291a0594..daf75d6f849 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
@@ -116,6 +116,8 @@ public class MultifileClassCodegen(
             tasks: Map<CallableMemberDescriptor, () -> Unit>,
             partFqNames: List<FqName>
     ) {
+        if (files.size() == 1 && state.classBuilderMode == ClassBuilderMode.LIGHT_CLASSES) return
+
         generateKotlinPackageReflectionField()
         MemberCodegen.generateModuleNameField(state, classBuilder)
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
index d6cdb215f8e..f947f0d7ea1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
@@ -44,12 +44,6 @@ public class MultifileClassPartCodegen(
         state: GenerationState
 ) : MemberCodegen<JetFile>(state, null, partContext, file, v) {
 
-    override fun generate() {
-        if (state.classBuilderMode == ClassBuilderMode.LIGHT_CLASSES) return
-
-        super.generate()
-    }
-
     override fun generateDeclaration() {
         v.defineClass(element, Opcodes.V1_6,
                       Opcodes.ACC_FINAL or Opcodes.ACC_SYNTHETIC,