diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
index 63ee3ba430..501374c132 100644
--- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
+++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
@@ -194,9 +194,7 @@ void EnumGenerator::GenerateHeader(io::Printer* printer) {
       CValuePreprocessorName(descriptor_));
 
   if (IsGenerateProperties(descriptor_->file())) {
-    printer->Print("- ($valuepreprocessorname$)number;\n",
-                   "valuepreprocessorname",
-                   CValuePreprocessorName(descriptor_));
+    printer->Print("@property(readonly) int number;\n");
     printer->Print("@property(readonly) $ordinalpreprocessorname$ nsEnum;\n",
                    "ordinalpreprocessorname",
                    COrdinalPreprocessorName(descriptor_));
@@ -369,11 +367,9 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
 
   if (IsGenerateProperties(descriptor_->file())) {
     printer->Print(
-        "- ($valuepreprocessorname$)number {\n"
-        "  return [self getNumber];\n"
-        "}\n",
-        "classname", ClassName(descriptor_), "valuepreprocessorname",
-        CValuePreprocessorName(descriptor_));
+        "- (int)number {\n"
+        "  return (int) [self getNumber];\n"
+        "}\n");
     printer->Print(
         "- ($ordinalpreprocessorname$)nsEnum {\n"
         "  return [self ordinal];\n"