diff --git a/common/BUILD b/common/BUILD
index ffc4ae1e9..a016d2cb5 100644
--- a/common/BUILD
+++ b/common/BUILD
@@ -583,7 +583,6 @@ cc_library(
         "//internal:string_pool",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/base:no_destructor",
         "@com_google_absl//absl/base:nullability",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
diff --git a/common/type.cc b/common/type.cc
index f94e8bc52..684c5ba09 100644
--- a/common/type.cc
+++ b/common/type.cc
@@ -640,8 +640,6 @@ constexpr absl::string_view kUInt64TypeName = "uint";
 constexpr absl::string_view kDoubleTypeName = "double";
 constexpr absl::string_view kStringTypeName = "string";
 constexpr absl::string_view kBytesTypeName = "bytes";
-constexpr absl::string_view kDurationTypeName = "google.protobuf.Duration";
-constexpr absl::string_view kTimestampTypeName = "google.protobuf.Timestamp";
 constexpr absl::string_view kListTypeName = "list";
 constexpr absl::string_view kMapTypeName = "map";
 constexpr absl::string_view kCelTypeTypeName = "type";
@@ -670,12 +668,6 @@ Type LegacyRuntimeType(absl::string_view name) {
   if (name == kBytesTypeName) {
     return BytesType{};
   }
-  if (name == kDurationTypeName) {
-    return DurationType{};
-  }
-  if (name == kTimestampTypeName) {
-    return TimestampType{};
-  }
   if (name == kListTypeName) {
     return ListType{};
   }
@@ -685,6 +677,53 @@ Type LegacyRuntimeType(absl::string_view name) {
   if (name == kCelTypeTypeName) {
     return TypeType{};
   }
+  if (cel::IsWellKnownMessageType(name)) {
+    if (name == "google.protobuf.Any") {
+      return AnyType();
+    }
+    if (name == "google.protobuf.BoolValue") {
+      return BoolWrapperType();
+    }
+    if (name == "google.protobuf.BytesValue") {
+      return BytesWrapperType();
+    }
+    if (name == "google.protobuf.DoubleValue") {
+      return DoubleWrapperType();
+    }
+    if (name == "google.protobuf.Duration") {
+      return DurationType();
+    }
+    if (name == "google.protobuf.FloatValue") {
+      return DoubleWrapperType();
+    }
+    if (name == "google.protobuf.Int32Value") {
+      return IntWrapperType();
+    }
+    if (name == "google.protobuf.Int64Value") {
+      return IntWrapperType();
+    }
+    if (name == "google.protobuf.ListValue") {
+      return ListType();
+    }
+    if (name == "google.protobuf.StringValue") {
+      return StringWrapperType();
+    }
+    if (name == "google.protobuf.Struct") {
+      return JsonMapType();
+    }
+    if (name == "google.protobuf.Timestamp") {
+      return TimestampType();
+    }
+    if (name == "google.protobuf.UInt32Value") {
+      return UintWrapperType();
+    }
+    if (name == "google.protobuf.UInt64Value") {
+      return UintWrapperType();
+    }
+    if (name == "google.protobuf.Value") {
+      return DynType();
+    }
+  }
   return common_internal::MakeBasicStructType(name);
 }
 
diff --git a/common/type_test.cc b/common/type_test.cc
index 2cebf27ba..d6a613c3c 100644
--- a/common/type_test.cc
+++ b/common/type_test.cc
@@ -638,5 +638,39 @@ TEST(Type, Wrap) {
   EXPECT_EQ(Type(AnyType()).Wrap(), AnyType());
 }
 
+TEST(Type, LegacyRuntimeType) {
+  EXPECT_EQ(common_internal::LegacyRuntimeType("bool"), BoolType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Any"),
+            AnyType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.BoolValue"),
+            BoolWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.BytesValue"),
+            BytesWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.DoubleValue"),
+            DoubleWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Duration"),
+            DurationType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.FloatValue"),
+            DoubleWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Int32Value"),
+            IntWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Int64Value"),
+            IntWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.ListValue"),
+            ListType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.StringValue"),
+            StringWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Struct"),
+            JsonMapType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Timestamp"),
+            TimestampType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.UInt32Value"),
+            UintWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.UInt64Value"),
+            UintWrapperType());
+  EXPECT_EQ(common_internal::LegacyRuntimeType("google.protobuf.Value"),
+            DynType());
+}
+
 }  // namespace
 }  // namespace cel