diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
index a86a8307deb..6d894206dcd 100644
--- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java
@@ -176,10 +176,6 @@ public class CodegenUtil {
                && KotlinTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString);
     }
 
-    public static boolean isEnumValuesProperty(@NotNull VariableDescriptor propertyDescriptor) {
-        return DescriptorUtils.ENUM_VALUES.equals(propertyDescriptor.getName());
-    }
-
     @Nullable
     public static Integer getLineNumberForElement(@NotNull PsiElement statement, boolean markEndOffset) {
         PsiFile file = statement.getContainingFile();
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 043fb42d45c..b5e70b2ae76 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -794,15 +794,12 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     private void generateEnumValuesMethod() {
         Type type = typeMapper.mapType(DescriptorUtilsKt.getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType()));
 
-        VariableDescriptor valuesProperty =
-                CollectionsKt.single(descriptor.getStaticScope().getContributedVariables(ENUM_VALUES, NoLookupLocation.FROM_BACKEND), new Function1<VariableDescriptor, Boolean>() {
-                    @Override
-                    public Boolean invoke(VariableDescriptor descriptor) {
-                        return CodegenUtil.isEnumValuesProperty(descriptor);
-                    }
-                });
-        MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(myClass, valuesProperty), ACC_PUBLIC | ACC_STATIC, ENUM_VALUES.asString(),
-                                       "()" + type.getDescriptor(), null, null);
+        FunctionDescriptor valuesFunction =
+                CollectionsKt.single(descriptor.getStaticScope().getContributedFunctions(ENUM_VALUES, NoLookupLocation.FROM_BACKEND));
+        MethodVisitor mv = v.newMethod(
+                JvmDeclarationOriginKt.OtherOrigin(myClass, valuesFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUES.asString(),
+                "()" + type.getDescriptor(), null, null
+        );
         if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
 
         mv.visitCode();
diff --git a/compiler/testData/builtin-classes-kotlin.txt b/compiler/testData/builtin-classes-kotlin.txt
index c9f248c9a7f..025e8d5f37d 100644
--- a/compiler/testData/builtin-classes-kotlin.txt
+++ b/compiler/testData/builtin-classes-kotlin.txt
@@ -211,8 +211,6 @@ public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel>
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.DeprecationLevel): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kotlin.DeprecationLevel>
-        public final fun <get-values>(): kotlin.Array<kotlin.DeprecationLevel>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.DeprecationLevel>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
index 747466ef913..4cf0070e2f8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
index a35ca980642..8faecc09d1a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
index 747466ef913..4cf0070e2f8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
index a35ca980642..8faecc09d1a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
index ff982b62035..ba7d174ff53 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
@@ -10,7 +10,6 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
index 3c3454c2a83..5bdbb5773b8 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
@@ -16,7 +16,6 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
index 900a162fe5c..987951c02b5 100644
--- a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
@@ -18,7 +18,6 @@ public final enum class K : kotlin.Enum<test.K> {
     public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.K>
     public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.K
     public final /*synthesized*/ fun values(): kotlin.Array<test.K>
 }
diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
index de5b87078be..fa34bf3c7ad 100644
--- a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
+++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
@@ -16,7 +16,6 @@ public final enum class Color : kotlin.Enum<Color> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Color>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color
     public final /*synthesized*/ fun values(): kotlin.Array<Color>
 }
diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt
index df6db7f740a..81eea40318c 100644
--- a/compiler/testData/diagnostics/tests/Serializable.txt
+++ b/compiler/testData/diagnostics/tests/Serializable.txt
@@ -24,7 +24,6 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
index b3a1c25c7f2..2f478ee623d 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
@@ -23,7 +23,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
index 20a89ca3c4a..3289652bd7d 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
@@ -21,7 +21,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
index bd4201c3432..6f812071813 100644
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
@@ -197,7 +197,6 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index cbbacc1ed24..903fd952505 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index 4cda12e5a22..16cd209f599 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index dc11ea3ce23..aa5f698f514 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index 667738de1fc..5d87b9a259c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
index 9e6847169fd..f33fc617b93 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
@@ -51,7 +51,6 @@ public final enum class Your : kotlin.Enum<Your> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Your>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Your
     public final /*synthesized*/ fun values(): kotlin.Array<Your>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index d8cb4ec636b..ded50db8424 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index ef53a4151ca..4d4ff0b1788 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index f13268aadf7..7dbbc030284 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index f6ef0de5449..21bbaaa88df 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index 6ea6ea7380c..b280d1c273d 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 4b39e514cce..ea92a96f66c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
@@ -18,7 +18,6 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
index aa20e1c1aaa..726d607828a 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
@@ -33,7 +33,6 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
     public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
index 191fcc6b254..54bc5263560 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
@@ -50,7 +50,6 @@ package a {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.C
         public final /*synthesized*/ fun values(): kotlin.Array<a.C>
     }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
index 5ec8d371bd6..55fc31295e6 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
@@ -132,7 +132,6 @@ package uninitialized_reassigned_variables {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): uninitialized_reassigned_variables.ProtocolState
         public final /*synthesized*/ fun values(): kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
     }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
index 71d5562c62e..ec6c11e5ef0 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
@@ -38,7 +38,6 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1185.Color>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Color
         public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
     }
@@ -62,7 +61,6 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1185.Direction>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Direction
         public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Direction>
     }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
index 7df033ac514..78571c49c9a 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
@@ -18,7 +18,6 @@ public final data enum class First : kotlin.Enum<First> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<First>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): First
     public final /*synthesized*/ fun values(): kotlin.Array<First>
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
index 863d02d3823..e1aee0a8477 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
@@ -74,7 +74,6 @@ public open enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
index 591983a92c0..e4709725130 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
@@ -26,7 +26,6 @@ package kt1193 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt1193.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
index 9ef9694f7f0..79375276714 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
@@ -27,7 +27,6 @@ public open enum class EN : kotlin.Enum<EN> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EN>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EN
     public final /*synthesized*/ fun values(): kotlin.Array<EN>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
index f86d832cdbd..a3dfde1451c 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
@@ -29,7 +29,6 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
@@ -80,7 +79,6 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Outer.<no name provided>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Outer.<no name provided>
         public final /*synthesized*/ fun values(): kotlin.Array<Outer.<no name provided>>
     }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
index f2f8c14bd6e..7cce4e39ca5 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
@@ -15,7 +15,6 @@ public final enum class E : kotlin.Enum<E> {
     public final fun values(): kotlin.Array<E>
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
index 71d7a728ba5..4bc6c26f63b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
@@ -19,7 +19,6 @@ public final enum class A : kotlin.Enum<A> {
     public final fun values(/*0*/ x: kotlin.String): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
index 2a18630319a..12ba8bd202e 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
@@ -13,7 +13,6 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<abstract.MyAbstractEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyAbstractEnum
         public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyAbstractEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
index 247a0862621..058c17dd481 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
@@ -44,7 +44,6 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<abstract.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
index 27b7456adb1..d12f7b7a871 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
@@ -14,7 +14,6 @@ public final enum class E : kotlin.Enum<E>, T {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
index 119d3855d5d..65b3097df62 100644
--- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
+++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
index 3e0158296cf..72e8e6e3d20 100644
--- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
@@ -17,7 +17,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
index b39369201eb..a8aa5c97690 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
@@ -17,7 +17,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
index c05810eb8e8..2d9d7d8e514 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
@@ -22,7 +22,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
index edb76d8f1af..07ec3b2bfe0 100644
--- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
@@ -21,7 +21,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
index fc82abc4eb4..d8b55bc0116 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
@@ -23,7 +23,6 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
index bd5a0811aae..03937e1362e 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
@@ -25,7 +25,6 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
index efa17e2558c..3b354017bf0 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
@@ -15,7 +15,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
@@ -33,7 +32,6 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
index 9c2c6a649c1..5d0de810905 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
@@ -22,7 +22,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
index 4e9e6aff5a6..12b57e2651e 100644
--- a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
+++ b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
@@ -13,7 +13,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
index 7a2dcb58bbf..1849b02fe41 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
index de92e1b4dad..7ab3a6043a0 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
index 9f8dd28ec45..9465d54c810 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
@@ -17,7 +17,6 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
index 8be3efbf547..6672d2b4d24 100644
--- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
@@ -16,7 +16,6 @@ public final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithFun>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithFun
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithFun>
 }
@@ -37,7 +36,6 @@ public final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumImplementingTraitWithVal>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithVal
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
index 6b8f4edfaf5..7c36b4103e5 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
@@ -14,7 +14,6 @@ public final enum class MyEnum : MyClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
@@ -30,7 +29,6 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
@@ -46,7 +44,6 @@ public final enum class MyEnum3 : MyEnumBase {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum3
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum3>
 }
@@ -62,7 +59,6 @@ public final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnumBase>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnumBase
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnumBase>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
index 5dba795fee4..dc5e099097c 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
index 6b347908663..bb301566fba 100644
--- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
@@ -18,7 +18,6 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
index aef810fdd18..804e3366c73 100644
--- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
@@ -29,7 +29,6 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
index 3749cdaa05f..9be2416bdde 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
@@ -19,7 +19,6 @@ package enum {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<enum.HappyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): enum.HappyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<enum.HappyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
index 1c85ff164a4..d69a6d0d25b 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
@@ -13,7 +13,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
index 7098e6761b0..5f8c7424aa2 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
@@ -11,7 +11,6 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
index 0324c2332ad..421841a26ed 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
index a425d1126c2..e357dd7e94d 100644
--- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
@@ -17,7 +17,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
index 5b6e66fb957..3cfe44652db 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
@@ -24,7 +24,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
index 17248fd9875..434144e7061 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
@@ -35,7 +35,6 @@ public open enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
@@ -51,7 +50,6 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
@@ -67,7 +65,6 @@ public final enum class MyJavaEnum : kotlin.Enum<MyJavaEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyJavaEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyJavaEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyJavaEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inline.txt b/compiler/testData/diagnostics/tests/enum/inline.txt
index 3324482372e..e04d5740ae0 100644
--- a/compiler/testData/diagnostics/tests/enum/inline.txt
+++ b/compiler/testData/diagnostics/tests/enum/inline.txt
@@ -13,7 +13,6 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
index e992c085127..5b7ace8a9f4 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
@@ -26,7 +26,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
@@ -58,7 +57,6 @@ public final class B {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B.E
         public final /*synthesized*/ fun values(): kotlin.Array<B.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
index 639ae9b034b..e09112b3ff8 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
@@ -19,7 +19,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
index 5485e6e861f..c7fd717b000 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
@@ -25,7 +25,6 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
index 13ca765f6b1..1953f1aa096 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
@@ -25,13 +25,11 @@ public final enum class E : kotlin.Enum<E> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.F
         public final /*synthesized*/ fun values(): kotlin.Array<E.F>
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
index 36303090bd3..8d187ea281f 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
@@ -13,7 +13,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
index 9a8160b93df..be3af55fd56 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
@@ -25,7 +25,6 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
index 675f0b8b4a9..081e17d896b 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
@@ -19,7 +19,6 @@ public object A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
index 02a2e4524e0..98e9888590a 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
@@ -18,7 +18,6 @@ public interface A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
index 0d4baf5e7da..f86f8f861fe 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
@@ -25,7 +25,6 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
@@ -44,7 +43,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
index 423f8ecd0ce..01c14c40352 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
@@ -19,7 +19,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
@@ -37,7 +36,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.F
         public final /*synthesized*/ fun values(): kotlin.Array<A.F>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
index 9a43cf05445..f21790a7acb 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
@@ -25,7 +25,6 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
@@ -50,7 +49,6 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
-            @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
index a425d1126c2..e357dd7e94d 100644
--- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
@@ -17,7 +17,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
index 8b052b3cc38..62b7e5dafd7 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
@@ -15,7 +15,6 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
index c725eb806b9..0db9dcbb532 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
@@ -17,7 +17,6 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
index 4b108dbc943..fe74c453f8b 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
@@ -16,7 +16,6 @@ public abstract enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
index 595e28f998b..d1fee7722d5 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
index 9761b8cf016..3102cacb914 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
index 97f99c69406..2ff4263d128 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
@@ -18,7 +18,6 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt
index a20fe6af047..e5dcd0c6526 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt
@@ -17,7 +17,6 @@ private final enum class MethodKind : kotlin.Enum<MethodKind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MethodKind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MethodKind
     public final /*synthesized*/ fun values(): kotlin.Array<MethodKind>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
index 7b0d288c318..e4e750b2ff1 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
@@ -13,7 +13,6 @@ public final enum class E : kotlin.Enum<E>, kotlin.Cloneable {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
index 8bababb8b08..710a9efcc6b 100644
--- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
@@ -43,7 +43,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
index da4bfcb7635..1ba4825a84d 100644
--- a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
+++ b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
@@ -21,7 +21,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
index 060b7baaded..62e9b73985b 100644
--- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
@@ -19,7 +19,6 @@ public final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumWithOpenMembers>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithOpenMembers
     public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
index 2b9a1fb235f..9f90a13b581 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
@@ -13,7 +13,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
index b62f875b24f..5b2d3676b8a 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
@@ -40,7 +40,6 @@ package foo {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<foo.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): foo.E
         public final /*synthesized*/ fun values(): kotlin.Array<foo.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
index aea8942cb47..21cb1e6272d 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
@@ -15,7 +15,6 @@ package bug {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<bug.Foo<T>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): bug.Foo<T>
         public final /*synthesized*/ fun values(): kotlin.Array<bug.Foo<T>>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
index 7848ca3a54d..7d0708369ca 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
@@ -31,7 +31,6 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
index 201647633ed..1b93bddd681 100644
--- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
@@ -101,7 +101,6 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.E
         public final /*synthesized*/ fun values(): kotlin.Array<a.E>
     }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
index 63163446c9e..0b48fb7de1e 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
@@ -19,7 +19,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
index 466d89390ca..14087f9056c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
@@ -23,7 +23,6 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
index b202a9c4785..1d68fcd3580 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
@@ -20,7 +20,6 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<a.TestEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.TestEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.TestEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
index dfd22083fcd..6e18d6d016d 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
@@ -44,7 +44,6 @@ public final enum class Kind : kotlin.Enum<Kind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Kind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Kind
     public final /*synthesized*/ fun values(): kotlin.Array<Kind>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
index 942d402dcb7..a926f55374a 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
index eb4e1f96d33..40af25725f8 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
@@ -68,7 +68,6 @@ public final class D {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D.R>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D.R
         public final /*synthesized*/ fun values(): kotlin.Array<D.R>
     }
@@ -103,7 +102,6 @@ public final enum class H : kotlin.Enum<H> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<H>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): H
     public final /*synthesized*/ fun values(): kotlin.Array<H>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
index 123ef7e813d..4e882f7fde3 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
@@ -35,7 +35,6 @@ public object Obj {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Obj.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Obj.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<Obj.NestedEnum>
     }
@@ -98,7 +97,6 @@ public final class WithClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<WithClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithClassObject.NestedEnum>
     }
@@ -154,7 +152,6 @@ public final class WithoutClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<WithoutClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithoutClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithoutClassObject.NestedEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
index 7ff4a8a8391..029543be686 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
@@ -37,7 +37,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
index d29a6862d27..1b4100ba0c6 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
@@ -18,7 +18,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
index f2c4e2b7e8b..abeacc4810a 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
@@ -24,7 +24,6 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
index 7e26ed7d6b7..df0b227821f 100644
--- a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
+++ b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
@@ -16,7 +16,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
index a8be5e6c576..cad38c04195 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
@@ -17,7 +17,6 @@ public final enum class Type : kotlin.Enum<Type!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Type>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Type
     public final /*synthesized*/ fun values(): kotlin.Array<Type>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt
index 7d6387e1acb..9c3dfa6b4e9 100644
--- a/compiler/testData/diagnostics/tests/j+k/serializable.txt
+++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt
@@ -22,7 +22,6 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
index 2fe0adca3b4..98bccffee17 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
@@ -82,7 +82,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
index 855b456c754..a39225e8c19 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
@@ -21,7 +21,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
index 89175eade21..58f7385c192 100644
--- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
@@ -89,7 +89,6 @@ public final enum class Enum : kotlin.Enum<Enum> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum
     public final /*synthesized*/ fun values(): kotlin.Array<Enum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt
index 3f784eadb7a..adb27cd5d72 100644
--- a/compiler/testData/diagnostics/tests/modifiers/protected.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt
@@ -46,7 +46,6 @@ public final enum class Our : kotlin.Enum<Our> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Our>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Our
     public final /*synthesized*/ fun values(): kotlin.Array<Our>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
index 1b74dadc665..9ae29595bcd 100644
--- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
@@ -34,7 +34,6 @@ public final enum class Third : kotlin.Enum<Third> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Third>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Third
     public final /*synthesized*/ fun values(): kotlin.Array<Third>
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
index 70e72ee0635..3359389a797 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
@@ -20,7 +20,6 @@ public/*package*/ open class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.Empty>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Empty
         public final /*synthesized*/ fun values(): kotlin.Array<A.Empty>
     }
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
index e70816fc9b6..30c442ba16d 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
@@ -26,7 +26,6 @@ public final class C {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C.<no name provided>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C.<no name provided>
         public final /*synthesized*/ fun values(): kotlin.Array<C.<no name provided>>
     }
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
index 5d9f5511330..fcdac0cfa2b 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
@@ -27,7 +27,6 @@ public final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<<no name provided>>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): <no name provided>
     public final /*synthesized*/ fun values(): kotlin.Array<<no name provided>>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
index 265558b76e6..5c14406404a 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
@@ -30,7 +30,6 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
index 98e9f4aaaa1..9d16d6c85b1 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
@@ -20,7 +20,6 @@ public final enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
index fbf4b315358..87583dca1ae 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
@@ -17,7 +17,6 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.A>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.A
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.A>
     }
@@ -36,7 +35,6 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.B>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.B
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
     }
@@ -55,7 +53,6 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.C
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
     }
@@ -80,7 +77,6 @@ package kt2418 {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<kt2418.D>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.D
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.D>
     }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
index 54a51b2c123..4e5acf4e44c 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
@@ -18,7 +18,6 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
     public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
index 0e9f8ab51bc..97261e7a5ae 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
@@ -18,7 +18,6 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
     public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
index 75f1ac65b20..108878d8f15 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
@@ -13,7 +13,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt4693.txt b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
index 4b74872ddd4..c316b3605b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt4693.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
@@ -14,7 +14,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
index c52ab860688..fea7542e770 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
@@ -16,7 +16,6 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
index 09b6e3c3dd2..71a4013a47e 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
@@ -18,7 +18,6 @@ public final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasse
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<DOMElementTestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): DOMElementTestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<DOMElementTestClasses>
 }
@@ -44,7 +43,6 @@ public final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<TestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<TestClasses>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
index 7a3c860ed1f..da29be6a750 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
@@ -34,7 +34,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
index 2281f0442af..171900c0a65 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
@@ -24,7 +24,6 @@ public final enum class Foo : kotlin.Enum<Foo> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
index 5cdbbe7e548..204da9af140 100644
--- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
+++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
@@ -26,7 +26,6 @@ public sealed enum class SealedEnum : kotlin.Enum<SealedEnum> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<SealedEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SealedEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SealedEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
index bd7537e9412..e61be41b48b 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
@@ -23,7 +23,6 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
index ee974f5db95..07fce0b0796 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
@@ -25,7 +25,6 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
@@ -52,7 +51,6 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
@@ -70,7 +68,6 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
@@ -96,7 +93,6 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
     public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
index 0f0fed34c13..cdfe3457b09 100644
--- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
@@ -30,7 +30,6 @@ public final enum class A4 : kotlin.Enum<A4> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A4
     public final /*synthesized*/ fun values(): kotlin.Array<A4>
 }
diff --git a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
index b92945d8e65..210936e4f66 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
+++ b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
@@ -78,7 +78,6 @@ public final enum class E1 : kotlin.Enum<E1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
index 53bb0f81d9b..57b789db777 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
@@ -17,7 +17,6 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
index 873d7f41ca5..c2f0e9c6b6f 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
@@ -21,7 +21,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
index 629d1218ae1..bf2c37a3852 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
@@ -17,7 +17,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
index 71532dcad86..d418e446762 100644
--- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
@@ -17,7 +17,6 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
index eda3bf5b5cf..7ff9d2ce1db 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
@@ -19,7 +19,6 @@ public final enum class Color : kotlin.Enum<Color> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Color>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color
     public final /*synthesized*/ fun values(): kotlin.Array<Color>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
index 5dd0d73612b..1661d468153 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
@@ -19,7 +19,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
index 5dd0d73612b..1661d468153 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
@@ -19,7 +19,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
index 61bb03d1e25..3be5416bbcd 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
@@ -21,7 +21,6 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
index 7e01f0e2001..c661c3221ae 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
@@ -17,7 +17,6 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
index db3889ff8ba..cef7eb2edc5 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
index 57940a675f8..269359327fb 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     @org.jetbrains.annotations.NotNull() public open fun create(): J
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
index db3889ff8ba..cef7eb2edc5 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
index db3889ff8ba..cef7eb2edc5 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
index db3889ff8ba..cef7eb2edc5 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
index 61bb03d1e25..3be5416bbcd 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
@@ -21,7 +21,6 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
index 61bb03d1e25..3be5416bbcd 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
@@ -21,7 +21,6 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
index 80dd697a29e..fdfecbbe82b 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
@@ -17,7 +17,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
index 80dd697a29e..fdfecbbe82b 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
@@ -17,7 +17,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
index 80dd697a29e..fdfecbbe82b 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
@@ -17,7 +17,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
index db3889ff8ba..cef7eb2edc5 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
@@ -17,7 +17,6 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
index fc79af27dbe..7424acd0ae3 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
@@ -21,7 +21,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
index fc79af27dbe..7424acd0ae3 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
@@ -21,7 +21,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
index fc79af27dbe..7424acd0ae3 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
@@ -21,7 +21,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
index 16c06af98ad..0bf982364cb 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
@@ -21,7 +21,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
index 80dd697a29e..fdfecbbe82b 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
@@ -17,7 +17,6 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
index 12ef5782045..4485d4a9505 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
@@ -15,7 +15,6 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
index df6db7f740a..81eea40318c 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
@@ -24,7 +24,6 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
index 98a700de2c7..178f8488fd9 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
@@ -82,7 +82,6 @@ public final class A {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
@@ -211,7 +210,6 @@ public final enum class E : kotlin.Enum<E> {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.E
         public final /*synthesized*/ fun values(): kotlin.Array<E.E>
     }
@@ -250,7 +248,6 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -336,7 +333,6 @@ public interface T {
         }
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<T.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): T.E
         public final /*synthesized*/ fun values(): kotlin.Array<T.E>
     }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
index 835f2646e34..fd72cd1b1b0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt
@@ -44,7 +44,6 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.E>
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
index 7ad1d8453d4..85c4f49c873 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt
@@ -23,7 +23,6 @@ public final enum class AnnotatedEnumEntry : kotlin.Enum<test.AnnotatedEnumEntry
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.AnnotatedEnumEntry>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.AnnotatedEnumEntry
     public final /*synthesized*/ fun values(): kotlin.Array<test.AnnotatedEnumEntry>
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index ef202c36118..252279b4780 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -17,7 +17,6 @@ public interface CustomAnnotation {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.CustomAnnotation.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
index df87419ca6b..53524339d73 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
@@ -14,7 +14,6 @@ public open class EnumArgumentWithCustomToString {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumArgumentWithCustomToString.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumArgumentWithCustomToString.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumArgumentWithCustomToString.E>
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
index d943de7662e..bdcea09ddb6 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
@@ -16,7 +16,6 @@ public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstruc
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumConstructorParameter
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
index 5379a02b875..d9b0f782ac5 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
@@ -19,7 +19,6 @@ public open class NestedEnumArgument {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.NestedEnumArgument.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.NestedEnumArgument.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.NestedEnumArgument.E>
     }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
index 69948e50eec..c56e649900c 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
@@ -14,7 +14,6 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
     public open fun first(): kotlin.Boolean
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumMembers>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
index 57a7ca9ad5e..62cdaa33ab1 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
@@ -16,7 +16,6 @@ public open enum class EnumWithSpecializedEntry : kotlin.Enum<test.EnumWithSpeci
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithSpecializedEntry>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithSpecializedEntry
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithSpecializedEntry>
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
index 22995e8ad79..6ae515619c6 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
@@ -12,7 +12,6 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.JavaEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index 99a0b3936ad..6215543c81f 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -26,7 +26,6 @@ public final enum class Enum : kotlin.Enum<test.Enum!> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
     public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index c0a5438db61..48d4e0b668f 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -12,7 +12,6 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     // Static members
     public final val CONSTANT: test.StaticMembersInEnum!
     public final var STATIC_FIELD: kotlin.Int
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
     public open fun foo(): kotlin.Unit
     public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
index bdf5a2acda0..2f480a2b28b 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt
@@ -29,7 +29,6 @@ public/*package*/ final enum class StaticMembersInEnum : kotlin.Enum<test.Static
     public final var c: kotlin.Int
     public final var d: kotlin.Int
     public const final override /*1*/ /*fake_override*/ val e: kotlin.Int
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.StaticMembersInEnum>
     public open fun foo(): kotlin.Unit
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index 2a0d772055c..931e4929bf2 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -16,8 +16,6 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
-        public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index a9e2a0db66c..b944aa705c5 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -12,8 +12,6 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
-        public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
index c8ff9ffb1f4..e67a135aff6 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt
@@ -30,8 +30,6 @@ public final enum class Eee : kotlin.Enum<test.Eee> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Eee): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Eee>
-        public final fun <get-values>(): kotlin.Array<test.Eee>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Eee
     public final /*synthesized*/ fun values(): kotlin.Array<test.Eee>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
index f5ba55abf0c..54a8548590b 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -22,8 +22,6 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
-        public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
index 3fde444e217..348e8c424e9 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -10,8 +10,6 @@ public final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test.E
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithGenericConstructorParameter): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithGenericConstructorParameter>
-        public final fun <get-values>(): kotlin.Array<test.EnumWithGenericConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index a36eabdc2e3..b1ab4756b17 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -10,8 +10,6 @@ public final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum<test
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithPrimitiveConstructorParameter): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
-        public final fun <get-values>(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
index e2bb8633c2f..a3050d07f80 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
@@ -12,8 +12,6 @@ internal final enum class In : kotlin.Enum<test.In> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.In>
-        public final fun <get-values>(): kotlin.Array<test.In>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In
     public final /*synthesized*/ fun values(): kotlin.Array<test.In>
 }
@@ -30,8 +28,6 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Pr>
-        public final fun <get-values>(): kotlin.Array<test.Pr>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr
     public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
 }
@@ -48,8 +44,6 @@ public final enum class Pu : kotlin.Enum<test.Pu> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Pu>
-        public final fun <get-values>(): kotlin.Array<test.Pu>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu
     public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
index 445467d3188..a3ebe3f68b5 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
@@ -20,8 +20,6 @@ public final enum class En : kotlin.Enum<test.En> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.En>
-        public final fun <get-values>(): kotlin.Array<test.En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
     public final /*synthesized*/ fun values(): kotlin.Array<test.En>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
index 5b9e808561a..fa830099f83 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
@@ -28,8 +28,6 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     }
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Enum>
-        public final fun <get-values>(): kotlin.Array<test.Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
     public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
index 5457baf479d..befc9905d7f 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
@@ -15,8 +15,6 @@ public final class A {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.A.E>
-            public final fun <get-values>(): kotlin.Array<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
index aa5a612de56..f1a5c15c0ac 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
@@ -19,8 +19,6 @@ public final class A {
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
 
         // Static members
-        @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.A.E>
-            public final fun <get-values>(): kotlin.Array<test.A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
index d7feb89c2f4..128faaf42bf 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
@@ -12,8 +12,6 @@ public final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.MyEnum>
-        public final fun <get-values>(): kotlin.Array<test.MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
index 4bb36b012ff..be04bab5435 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
@@ -14,8 +14,6 @@ public final enum class Test : kotlin.Enum<test.Test> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Test>
-        public final fun <get-values>(): kotlin.Array<test.Test>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
     public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
index be741af2e82..b21d8ed86a3 100644
--- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
+++ b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
@@ -26,8 +26,6 @@ public final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.E>
-        public final fun <get-values>(): kotlin.Array<test.E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
     public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt b/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
index 6dc12c5bea5..d20c75d598b 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotatedEnumEntry.txt
@@ -26,7 +26,6 @@ public final enum class Eee : kotlin.Enum<test.Eee> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Eee): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Eee>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Eee
     public final /*synthesized*/ fun values(): kotlin.Array<test.Eee>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
index f66248b0f0b..97a31387580 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
@@ -32,7 +32,6 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
     public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
index 9105514ac15..c89beb91349 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
@@ -14,7 +14,6 @@ public final enum class My : kotlin.Enum<test.My> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.My
     public final /*synthesized*/ fun values(): kotlin.Array<test.My>
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
index 921dbeba36e..ab8f73dfee5 100644
--- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
+++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
@@ -45,7 +45,6 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
     public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/compiler/testData/serialization/js/dynamicConstants.txt b/compiler/testData/serialization/js/dynamicConstants.txt
index 0eb6c87d264..a3569e949f0 100644
--- a/compiler/testData/serialization/js/dynamicConstants.txt
+++ b/compiler/testData/serialization/js/dynamicConstants.txt
@@ -43,7 +43,6 @@ public final enum class Weapon : kotlin.Enum<test.Weapon> {
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
 
     // Static members
-    @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Use 'values()' function instead", replaceWith = kotlin.ReplaceWith(expression = "this.values()", imports = {})) public final /*synthesized*/ val values: kotlin.Array<test.Weapon>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Weapon
     public final /*synthesized*/ fun values(): kotlin.Array<test.Weapon>
 }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt
index 51d09c68cd0..8622c8d30e0 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt
@@ -28,7 +28,8 @@ import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext
 import org.jetbrains.kotlin.load.java.structure.JavaClass
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.DescriptorFactory.*
+import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValueOfMethod
+import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValuesMethod
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.types.KotlinType
@@ -52,14 +53,14 @@ class LazyJavaStaticClassScope(
     }
 
     override fun getFunctionNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> {
-        if (jClass.isEnum()) {
+        if (jClass.isEnum) {
             return super.getFunctionNames(kindFilter, nameFilter) + listOf(DescriptorUtils.ENUM_VALUE_OF, DescriptorUtils.ENUM_VALUES)
         }
         return super.getFunctionNames(kindFilter, nameFilter)
     }
 
     override fun getPropertyNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> =
-            memberIndex().getAllFieldNames() + (if (jClass.isEnum) listOf(DescriptorUtils.ENUM_VALUES) else emptyList())
+            memberIndex().getAllFieldNames()
 
     override fun getClassNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> = listOf()
 
@@ -89,24 +90,17 @@ class LazyJavaStaticClassScope(
     override fun computeNonDeclaredProperties(name: Name, result: MutableCollection<PropertyDescriptor>) {
         val propertiesFromSupertypes = getStaticPropertiesFromJavaSupertypes(name, ownerDescriptor)
 
-        val actualProperties =
-                if (!result.isEmpty()) {
-                    resolveOverridesForStaticMembers(name, propertiesFromSupertypes, result, ownerDescriptor, c.components.errorReporter)
-                }
-                else {
-                    propertiesFromSupertypes.groupBy {
-                        it.realOriginal
-                    }.flatMap {
-                        resolveOverridesForStaticMembers(name, it.value, result, ownerDescriptor, c.components.errorReporter)
-                    }
-                }
-
-        result.addAll(actualProperties)
-
-        if (jClass.isEnum) {
-            if (name == DescriptorUtils.ENUM_VALUES) {
-                result.add(createEnumValuesProperty(ownerDescriptor))
-            }
+        if (result.isNotEmpty()) {
+            result.addAll(resolveOverridesForStaticMembers(
+                    name, propertiesFromSupertypes, result, ownerDescriptor, c.components.errorReporter
+            ))
+        }
+        else {
+            result.addAll(propertiesFromSupertypes.groupBy {
+                it.realOriginal
+            }.flatMap {
+                resolveOverridesForStaticMembers(name, it.value, result, ownerDescriptor, c.components.errorReporter)
+            })
         }
     }
 
@@ -124,7 +118,7 @@ class LazyJavaStaticClassScope(
 
             if (staticScope !is LazyJavaStaticClassScope) return getStaticPropertiesFromJavaSupertypes(name, superTypeDescriptor)
 
-            return staticScope.getContributedVariables(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS).map { it }
+            return staticScope.getContributedVariables(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS)
         }
 
         return descriptor.typeConstructor.supertypes.flatMap(::getStaticProperties).toSet()
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
index 13bb98fa026..3ab8412852d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
@@ -18,7 +18,6 @@
 package org.jetbrains.kotlin.load.java
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES as BUILTIN_NAMES
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.getSpecialSignatureInfo
 import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.sameAsBuiltinMethodWithErasedValueParameters
@@ -31,6 +30,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.*
 import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns.FQ_NAMES as BUILTIN_NAMES
 
 private fun FqName.child(name: String): FqName = child(Name.identifier(name))
 private fun FqNameUnsafe.childSafe(name: String): FqName = child(Name.identifier(name)).toSafe()
@@ -240,13 +240,6 @@ fun <T : CallableMemberDescriptor> T.getOverriddenBuiltinReflectingJvmDescriptor
 }
 
 fun getJvmMethodNameIfSpecial(callableMemberDescriptor: CallableMemberDescriptor): String? {
-    if (callableMemberDescriptor.propertyIfAccessor.name == DescriptorUtils.ENUM_VALUES) {
-        val containingDeclaration = callableMemberDescriptor.containingDeclaration
-        if (callableMemberDescriptor is PropertyAccessorDescriptor
-                && containingDeclaration is ClassDescriptor
-                && containingDeclaration.kind == ClassKind.ENUM_CLASS) return DescriptorUtils.ENUM_VALUES.asString()
-    }
-
     val overriddenBuiltin = getOverriddenBuiltinThatAffectsJvmName(callableMemberDescriptor)?.propertyIfAccessor
                             ?: return null
     return when (overriddenBuiltin) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
index 286f6dc8058..09ef10d5831 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
@@ -63,9 +63,5 @@ class AnnotationsImpl : Annotations {
         @JvmStatic fun create(annotationsWithTargets: List<AnnotationWithTarget>): AnnotationsImpl {
             return AnnotationsImpl(annotationsWithTargets, 0)
         }
-
-        @JvmStatic fun createWithNoTarget(vararg annotations: AnnotationDescriptor): AnnotationsImpl {
-            return create(annotations.map { AnnotationWithTarget(it, null) })
-        }
     }
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
index 074800b4e31..7157883eb9c 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
@@ -26,6 +26,8 @@ import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.constants.StringValue
 import org.jetbrains.kotlin.types.Variance
 
+// This function may be useful if we deprecate something not via the annotation but with special code in the compiler
+@Suppress("unused")
 fun KotlinBuiltIns.createDeprecatedAnnotation(
         message: String,
         replaceWith: String,
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
index 6a89edca8e2..2cb610a3f76 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
@@ -19,9 +19,7 @@ package org.jetbrains.kotlin.resolve;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUtilKt;
 import org.jetbrains.kotlin.descriptors.annotations.Annotations;
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl;
 import org.jetbrains.kotlin.descriptors.impl.*;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
@@ -130,31 +128,6 @@ public class DescriptorFactory {
                                  Modality.FINAL, Visibilities.PUBLIC);
     }
 
-    @NotNull
-    public static PropertyDescriptor createEnumValuesProperty(@NotNull ClassDescriptor enumClass) {
-        AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget(AnnotationUtilKt.createDeprecatedAnnotation(
-                getBuiltIns(enumClass), "Use 'values()' function instead", "this.values()", "ERROR"
-        ));
-
-        PropertyDescriptorImpl values =
-                PropertyDescriptorImpl.create(
-                        enumClass, annotations, Modality.FINAL, Visibilities.PUBLIC, /* isVar */ false,
-                        DescriptorUtils.ENUM_VALUES, CallableMemberDescriptor.Kind.SYNTHESIZED, enumClass.getSource(),
-                        /* lateInit = */ false, /* isConst = */ false
-                );
-
-        KotlinType type = getBuiltIns(enumClass).getArrayType(Variance.INVARIANT, enumClass.getDefaultType());
-
-        PropertyGetterDescriptorImpl getter = createGetter(
-                values, Annotations.Companion.getEMPTY(), /* isDefault = */ false, /* isExternal = */ false);
-
-        values.initialize(getter, null);
-        getter.initialize(type);
-        values.setType(type, Collections.<TypeParameterDescriptor>emptyList(), null, (KotlinType) null);
-
-        return values;
-    }
-
     @NotNull
     public static SimpleFunctionDescriptor createEnumValueOfMethod(@NotNull ClassDescriptor enumClass) {
         SimpleFunctionDescriptorImpl valueOf =
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinEnum.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinEnum.kt
index 9a05f24c610..b1cb10c788b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinEnum.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinEnum.kt
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.resolve.scopes
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.DescriptorFactory.*
+import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValueOfMethod
+import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValuesMethod
 import org.jetbrains.kotlin.utils.Printer
 import java.util.*
 
@@ -38,16 +38,10 @@ class StaticScopeForKotlinEnum(private val containingClass: ClassDescriptor) : M
         listOf(createEnumValueOfMethod(containingClass), createEnumValuesMethod(containingClass))
     }
 
-    private val properties: List<PropertyDescriptor> by lazy {
-        listOf(createEnumValuesProperty(containingClass))
-    }
+    override fun getContributedDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean) = functions
 
-    override fun getContributedDescriptors(kindFilter: DescriptorKindFilter,
-                                           nameFilter: (Name) -> Boolean) = functions + properties
-
-    override fun getContributedVariables(name: Name, location: LookupLocation) = properties.filterTo(ArrayList(1)) { it.name == name }
-
-    override fun getContributedFunctions(name: Name, location: LookupLocation) = functions.filterTo(ArrayList<FunctionDescriptor>(2)) { it.name == name }
+    override fun getContributedFunctions(name: Name, location: LookupLocation) =
+            functions.filterTo(ArrayList<FunctionDescriptor>(1)) { it.name == name }
 
     override fun printScopeStructure(p: Printer) {
         p.println("Static scope for $containingClass")
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt
deleted file mode 100644
index 634ee61352d..00000000000
--- a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Replace with 'this.values()'" "true"
-
-enum class MyEnum {}
-
-fun foo() {
-    MyEnum.<caret>values
-}
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after b/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after
deleted file mode 100644
index f6807f173f1..00000000000
--- a/idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt.after
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Replace with 'this.values()'" "true"
-
-enum class MyEnum {}
-
-fun foo() {
-    MyEnum.values()
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index bac306d2728..6474ca97e74 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -3485,12 +3485,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
-        @TestMetadata("enumValues.kt")
-        public void testEnumValues() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("extensionForGenericClass.kt")
         public void testExtensionForGenericClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/extensionForGenericClass.kt");