diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
index c4fdf92f41..9041497c1f 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
@@ -378,7 +378,7 @@ private static void writeRegionCodeConstantsToJavaFile(Collection<String> region
         .setModifiers("final")
         .setCopyright(Integer.parseInt(copyright));
 
-    writer.addToJavadoc(REGION_CODE_CONSTS_JAVADOC);
+    writer.setJavadoc(REGION_CODE_CONSTS_JAVADOC);
     
     for (String regionCode : regionCodeList) {
       String variableName = regionCode.toUpperCase();
@@ -423,13 +423,7 @@ final Builder addToImports(String name) {
         return this;
       }
 
-      abstract Builder setJavadoc(String javadoc);
-      private final StringBuilder javadocBuilder = new StringBuilder();
-      final Builder addToJavadoc(String text) {
-        javadocBuilder.append(text);
-        return this;
-      }
-      
+      abstract Builder setJavadoc(String javadoc);      
       abstract Builder setName(String name);
       abstract Builder setModifiers(String modifiers);
       
@@ -448,7 +442,6 @@ final Builder formatToBody(String format, Object... args) {
       abstract ClassWriter autoBuild();
       
       final ClassWriter build() {
-        setJavadoc(javadocBuilder.toString());
         setBody(bodyBuilder.toString());
         return autoBuild();
       }