diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
index 53578d3d0e..4e61c0df2a 100644
--- a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
+++ b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
@@ -18,7 +18,6 @@
 import com.google.api.ResourceDescriptor;
 import com.google.api.ResourceProto;
 import com.google.api.generator.engine.ast.TypeNode;
-import com.google.api.generator.engine.ast.VaporReference;
 import com.google.api.generator.gapic.model.Field;
 import com.google.api.generator.gapic.model.GapicBatchingSettings;
 import com.google.api.generator.gapic.model.GapicContext;
@@ -241,9 +240,7 @@ private static Map<String, Message> parseMessages(
     messages.put(
         messageName,
         Message.builder()
-            .setType(
-                TypeNode.withReference(
-                    VaporReference.builder().setName(messageName).setPakkage(pakkage).build()))
+            .setType(TypeParser.parseType(messageDescriptor))
             .setName(messageName)
             .setFields(parseFields(messageDescriptor))
             .setOuterNestedTypes(outerNestedTypes)
diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
index 6335236d89..708caa0c80 100644
--- a/test/integration/BUILD.bazel
+++ b/test/integration/BUILD.bazel
@@ -7,7 +7,6 @@ load(
     "//:rules_bazel/java/integration_test.bzl",
     "golden_update",
     "integration_test",
-    "golden_update",
 )
 
 package(default_visibility = ["//visibility:public"])
@@ -40,25 +39,6 @@ golden_update(
     target = ":asset_java_gapic",
 )
 
-golden_update(
-    name = "asset_update",
-    data = ["//test/integration/goldens/asset:goldens_files"],
-    data = ["//test/integration/goldens/asset:goldens_files"],
-    target = ":asset_java_gapic",
-)
-
-golden_update(
-    name = "redis_update",
-    target = ":redis_java_gapic",
-    data = ["//test/integration/goldens/redis:goldens_files"],
-)
-
-golden_update(
-    name = "asset_update",
-    target = ":asset_java_gapic",
-    data = ["//test/integration/goldens/asset:goldens_files"],
-)
-
 ####################################################
 # API Library Rules
 ####################################################