diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index b56e38ced0e..1d15e9c7706 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -148,7 +148,9 @@ public class FunctionCodegen extends ParentCodegenAware {
 
         generateParameterAnnotations(functionDescriptor, mv, jvmSignature);
 
-        generateJetValueParameterAnnotations(mv, functionDescriptor, jvmSignature);
+        if (state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES) {
+            generateJetValueParameterAnnotations(mv, functionDescriptor, jvmSignature);
+        }
 
         generateBridges(functionDescriptor);
 
diff --git a/compiler/testData/asJava/lightClasses/delegation/Function.java b/compiler/testData/asJava/lightClasses/delegation/Function.java
index 2f20ee80c29..d15636618a1 100644
--- a/compiler/testData/asJava/lightClasses/delegation/Function.java
+++ b/compiler/testData/asJava/lightClasses/delegation/Function.java
@@ -1,6 +1,6 @@
 public final class Derived implements kotlin.jvm.internal.KObject, Base {
-    public Derived(@jet.runtime.typeinfo.JetValueParameter(name = "x") @org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
+    public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
-    public java.lang.String baz(@jet.runtime.typeinfo.JetValueParameter(name = "s") @org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
+    public java.lang.String baz(@org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/delegation/Property.java b/compiler/testData/asJava/lightClasses/delegation/Property.java
index 8d1b2eb8428..29411d4b5c8 100644
--- a/compiler/testData/asJava/lightClasses/delegation/Property.java
+++ b/compiler/testData/asJava/lightClasses/delegation/Property.java
@@ -1,5 +1,5 @@
 public final class Derived implements kotlin.jvm.internal.KObject, Base {
-    public Derived(@jet.runtime.typeinfo.JetValueParameter(name = "x") @org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
+    public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
     public java.lang.String getBoo() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
index 7e9d6d7a563..9bc000314cf 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
@@ -9,10 +9,10 @@ public final class Class implements kotlin.jvm.internal.KObject {
     private java.lang.String notNullVar;
 
     @org.jetbrains.annotations.NotNull
-    public final java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+    public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
-    public final java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+    public final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
     public final java.lang.String notNullWithNN() { /* compiled code */ }
@@ -34,7 +34,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
     @org.jetbrains.annotations.Nullable
     public final java.lang.String getNullableVar() { /* compiled code */ }
 
-    public final void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+    public final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
     public final java.lang.String getNotNullVal() { /* compiled code */ }
@@ -42,7 +42,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
     @org.jetbrains.annotations.NotNull
     public final java.lang.String getNotNullVar() { /* compiled code */ }
 
-    public final void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+    public final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     @org.jetbrains.annotations.NotNull
@@ -53,7 +53,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
     public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
-    public final void setNotNullVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v") @org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+    public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
     @org.jetbrains.annotations.Nullable
@@ -64,7 +64,7 @@ public final class Class implements kotlin.jvm.internal.KObject {
     public final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
-    public final void setNullableVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v", type = "?") @org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+    public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
 
     public Class() { /* compiled code */ }
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
index a96e3f9fdd9..2c301e60276 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java
@@ -1,3 +1,3 @@
 public final class ClassWithConstructor implements kotlin.jvm.internal.KObject {
-    public ClassWithConstructor(@jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") @org.jetbrains.annotations.Nullable java.lang.String nullable, @jet.runtime.typeinfo.JetValueParameter(name = "notNull") @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
+    public ClassWithConstructor(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
index 86b9ca5df9f..9b956541f94 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java
@@ -10,5 +10,5 @@ public final class ClassWithConstructorAndProperties implements kotlin.jvm.inter
     @org.jetbrains.annotations.NotNull
     public final java.lang.String getNotNull() { /* compiled code */ }
 
-    public ClassWithConstructorAndProperties(@jet.runtime.typeinfo.JetValueParameter(name = "nullable", type = "?") @org.jetbrains.annotations.Nullable java.lang.String nullable, @jet.runtime.typeinfo.JetValueParameter(name = "notNull") @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
+    public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
index 337546bfa6f..df6cd40befb 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java
@@ -1,12 +1,12 @@
 public interface Generic <N, NN> {
-    N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
+    N a(N n);
 
     @org.jetbrains.annotations.NotNull
-    NN b(@jet.runtime.typeinfo.JetValueParameter(name = "nn") @org.jetbrains.annotations.NotNull NN nn);
+    NN b(@org.jetbrains.annotations.NotNull NN nn);
 
     @org.jetbrains.annotations.Nullable
-    N a1(@jet.runtime.typeinfo.JetValueParameter(name = "n", type = "?") @org.jetbrains.annotations.Nullable N n);
+    N a1(@org.jetbrains.annotations.Nullable N n);
 
     @org.jetbrains.annotations.Nullable
-    NN b1(@jet.runtime.typeinfo.JetValueParameter(name = "nn", type = "?") @org.jetbrains.annotations.Nullable NN nn);
+    NN b1(@org.jetbrains.annotations.Nullable NN nn);
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
index b2280afdc2b..68f2315c3f9 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java
@@ -1,5 +1,5 @@
 public interface Primitives {
-    int $$int /* Real name is 'int' */(@jet.runtime.typeinfo.JetValueParameter(name = "x") int x);
+    int $$int /* Real name is 'int' */(int x);
 
     @org.jetbrains.annotations.Nullable
     java.lang.Boolean getNullableBool();
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
index 21add3f1785..90487537a46 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java
@@ -1,11 +1,11 @@
 public final class PrivateInClass implements kotlin.jvm.internal.KObject {
     private final java.lang.String getNn() { /* compiled code */ }
 
-    private final void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") java.lang.String value) { /* compiled code */ }
+    private final void setNn(java.lang.String value) { /* compiled code */ }
 
     private final java.lang.String getN() { /* compiled code */ }
 
-    private final java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") java.lang.String b) { /* compiled code */ }
+    private final java.lang.String bar(java.lang.String a, java.lang.String b) { /* compiled code */ }
 
-    private PrivateInClass(@jet.runtime.typeinfo.JetValueParameter(name = "s", type = "?") java.lang.String s) { /* compiled code */ }
+    private PrivateInClass(java.lang.String s) { /* compiled code */ }
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
index f2d71c146cf..2cac91c83cf 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.java
@@ -2,11 +2,11 @@ public interface PrivateInTrait {
     @org.jetbrains.annotations.NotNull
     java.lang.String getNn();
 
-    void setNn(@jet.runtime.typeinfo.JetValueParameter(name = "value") @org.jetbrains.annotations.NotNull java.lang.String value);
+    void setNn(@org.jetbrains.annotations.NotNull java.lang.String value);
 
     @org.jetbrains.annotations.Nullable
     java.lang.String getN();
 
     @org.jetbrains.annotations.Nullable
-    java.lang.String bar(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") @org.jetbrains.annotations.Nullable java.lang.String b);
+    java.lang.String bar(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b);
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
index 598e9222342..00cb9edff1f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java
@@ -1,9 +1,9 @@
 public interface Trait {
     @org.jetbrains.annotations.NotNull
-    java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a);
+    java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a);
 
     @org.jetbrains.annotations.Nullable
-    java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a);
+    java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a);
 
     @org.jetbrains.annotations.NotNull
     java.lang.String notNullWithNN();
@@ -25,7 +25,7 @@ public interface Trait {
     @org.jetbrains.annotations.Nullable
     java.lang.String getNullableVar();
 
-    void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p);
+    void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p);
 
     @org.jetbrains.annotations.NotNull
     java.lang.String getNotNullVal();
@@ -33,5 +33,5 @@ public interface Trait {
     @org.jetbrains.annotations.NotNull
     java.lang.String getNotNullVar();
 
-    void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p);
+    void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
 }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
index 9528527795f..d2e957c7211 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java
@@ -1,5 +1,5 @@
 public final class C implements kotlin.jvm.internal.KObject, Base<kotlin.Unit> {
-    public void foo(@jet.runtime.typeinfo.JetValueParameter(name = "t") @org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
+    public void foo(@org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
 
     public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
index 1ff6cf2cc1d..b4a2a94978a 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java
@@ -1,3 +1,3 @@
 public final class _DefaultPackage {
-    public static final void foo(@jet.runtime.typeinfo.JetValueParameter(name = "s") @org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
+    public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
index 3fab5c4707f..17eb6d488d9 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java
@@ -1,3 +1,3 @@
 public final class _DefaultPackage {
-    public static final void foo(@jet.runtime.typeinfo.JetValueParameter(name = "s") @org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
+    public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String s) { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
index c380a6fea3c..7200fd00117 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.java
@@ -9,14 +9,14 @@ public final class _DefaultPackage {
     @org.jetbrains.annotations.NotNull
     public static final java.lang.String getNotNullVar() { /* compiled code */ }
 
-    public static final void setNotNullVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>") @org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
+    public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     @org.jetbrains.annotations.NotNull
     public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
-    public static final void setNotNullVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v") @org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
+    public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String getNullableVal() { /* compiled code */ }
@@ -28,14 +28,14 @@ public final class _DefaultPackage {
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String getNullableVar() { /* compiled code */ }
 
-    public static final void setNullableVar(@jet.runtime.typeinfo.JetValueParameter(name = "<set-?>", type = "?") @org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
+    public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
-    public static final void setNullableVarWithGetSet(@jet.runtime.typeinfo.JetValueParameter(name = "v", type = "?") @org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
+    public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String getPrivateN() { /* compiled code */ }
@@ -44,7 +44,7 @@ public final class _DefaultPackage {
     public static final java.lang.String getPrivateNn() { /* compiled code */ }
 
     @org.jetbrains.annotations.NotNull
-    public static final java.lang.String notNull(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
+    public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     @org.jetbrains.annotations.NotNull
@@ -54,7 +54,7 @@ public final class _DefaultPackage {
     public static final java.lang.String notNullWithNN() { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
-    public static final java.lang.String nullable(@jet.runtime.typeinfo.JetValueParameter(name = "a", type = "?") @org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
+    public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String nullableWithN() { /* compiled code */ }
@@ -64,5 +64,5 @@ public final class _DefaultPackage {
     public static final java.lang.String nullableWithNN() { /* compiled code */ }
 
     @org.jetbrains.annotations.Nullable
-    public static final java.lang.String privateFun(@jet.runtime.typeinfo.JetValueParameter(name = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @jet.runtime.typeinfo.JetValueParameter(name = "b", type = "?") @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
+    public static final java.lang.String privateFun(@org.jetbrains.annotations.NotNull java.lang.String a, @org.jetbrains.annotations.Nullable java.lang.String b) { /* compiled code */ }
 }
\ No newline at end of file