diff --git a/go.mod b/go.mod
index ada9fbfd47..a2a3bc577a 100644
--- a/go.mod
+++ b/go.mod
@@ -46,7 +46,7 @@ require (
 	golang.org/x/sync v0.11.0
 	golang.org/x/term v0.29.0
 	golang.org/x/tools v0.30.0
-	google.golang.org/protobuf v1.36.4
+	google.golang.org/protobuf v1.36.5
 	gopkg.in/yaml.v3 v3.0.1
 	pluginrpc.com/pluginrpc v0.5.0
 )
diff --git a/go.sum b/go.sum
index ccca6d5d67..68865f3482 100644
--- a/go.sum
+++ b/go.sum
@@ -308,8 +308,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
 google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
 google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk
index 32a7d20d89..d266cd5db4 100644
--- a/make/go/dep_golangci_lint.mk
+++ b/make/go/dep_golangci_lint.mk
@@ -6,19 +6,35 @@ $(call _conditional_include,$(MAKEGO)/base.mk)
 $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
-# We want to ensure we rebuild golangci-lint every time we require a new Go minor version.
-# Otherwise, the cached version may not support the latest language features.
-GOLANGCI_LINT_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
+ifeq ($(UNAME_OS),Darwin)
+GOLANGCI_LINT_OS := darwin
+else ifeq ($(UNAME_OS),Linux)
+GOLANGCI_LINT_OS := linux
+endif
+
+ifeq ($(UNAME_ARCH),x86_64)
+GOLANGCI_LINT_ARCH := amd64
+else ifeq ($(UNAME_ARCH),arm64)
+GOLANGCI_LINT_ARCH := arm64
+else ifeq ($(UNAME_ARCH),aarch64)
+GOLANGCI_LINT_ARCH := arm64
+else
+GOLANGCI_LINT_ARCH := $(UNAME_ARCH)
+endif
 
 # Settable
-# https://github.com/golangci/golangci-lint/releases 20250103 checked 20250124
+# https://github.com/golangci/golangci-lint/releases 20250212 checked 20250212
 # Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading
-GOLANGCI_LINT_VERSION ?= v1.63.4
+GOLANGCI_LINT_VERSION ?= v1.64.3
 
-GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)-go$(GOLANGCI_LINT_GO_VERSION)
+GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)
 $(GOLANGCI_LINT):
 	@rm -f $(CACHE_BIN)/golangci-lint
-	GOBIN=$(CACHE_BIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	$(eval GOLANGCI_LINT_TMP := $(shell mktemp -d))
+	curl -fsSL -o $(GOLANGCI_LINT_TMP)/golangci-lint.tar.gz \
+		https://github.com/golangci/golangci-lint/releases/download/$(GOLANGCI_LINT_VERSION)/golangci-lint-$(subst v,,$(GOLANGCI_LINT_VERSION))-$(GOLANGCI_LINT_OS)-$(GOLANGCI_LINT_ARCH).tar.gz
+	cd $(GOLANGCI_LINT_TMP); tar zxf $(GOLANGCI_LINT_TMP)/golangci-lint.tar.gz --strip-components 1 && mv golangci-lint $(CACHE_BIN)/golangci-lint
+	@rm -rf $(GOLANGCI_LINT_TMP)
 	@rm -rf $(dir $(GOLANGCI_LINT))
 	@mkdir -p $(dir $(GOLANGCI_LINT))
 	@touch $(GOLANGCI_LINT)
diff --git a/make/go/dep_protoc_gen_go.mk b/make/go/dep_protoc_gen_go.mk
index eae17eeaea..dc1c43e805 100644
--- a/make/go/dep_protoc_gen_go.mk
+++ b/make/go/dep_protoc_gen_go.mk
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/protocolbuffers/protobuf-go/releases 20250124 checked 20250124
-PROTOC_GEN_GO_VERSION ?= v1.36.4
+# https://github.com/protocolbuffers/protobuf-go/releases 20250206 checked 20250210
+PROTOC_GEN_GO_VERSION ?= v1.36.5
 
 GO_GET_PKGS := $(GO_GET_PKGS) \
 	google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION)
diff --git a/private/buf/cmd/buf/buf_test.go b/private/buf/cmd/buf/buf_test.go
index 864faff2ae..698504aff1 100644
--- a/private/buf/cmd/buf/buf_test.go
+++ b/private/buf/cmd/buf/buf_test.go
@@ -67,7 +67,6 @@ var (
 		{ID: "FIELD_LOWER_SNAKE_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that field names are lower_snake_case."},
 		{ID: "FIELD_NOT_REQUIRED", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that fields are not configured to be required."},
 		{ID: "IMPORT_NO_PUBLIC", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are not public."},
-		{ID: "IMPORT_NO_WEAK", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are not weak."},
 		{ID: "IMPORT_USED", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that imports are used."},
 		{ID: "MESSAGE_PASCAL_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that messages are PascalCase."},
 		{ID: "ONEOF_LOWER_SNAKE_CASE", Categories: []string{"BASIC", "STANDARD"}, Default: true, Purpose: "Checks that oneof names are lower_snake_case."},
@@ -679,7 +678,6 @@ ENUM_PASCAL_CASE                  BASIC, STANDARD           *        Checks that
 ENUM_VALUE_UPPER_SNAKE_CASE       BASIC, STANDARD           *        Checks that enum values are UPPER_SNAKE_CASE.
 FIELD_LOWER_SNAKE_CASE            BASIC, STANDARD           *        Checks that field names are lower_snake_case.
 IMPORT_NO_PUBLIC                  BASIC, STANDARD           *        Checks that imports are not public.
-IMPORT_NO_WEAK                    BASIC, STANDARD           *        Checks that imports are not weak.
 IMPORT_USED                       BASIC, STANDARD           *        Checks that imports are used.
 MESSAGE_PASCAL_CASE               BASIC, STANDARD           *        Checks that messages are PascalCase.
 ONEOF_LOWER_SNAKE_CASE            BASIC, STANDARD           *        Checks that oneof names are lower_snake_case.
@@ -876,7 +874,6 @@ PACKAGE_SAME_SWIFT_PREFIX         MINIMAL, BASIC, STANDARD, PACKAGE_AFFINITY
 ENUM_NO_ALLOW_ALIAS               MINIMAL, BASIC, STANDARD, SENSIBLE            *        Checks that enums do not have the allow_alias option set.
 FIELD_NO_DESCRIPTOR               MINIMAL, BASIC, STANDARD, SENSIBLE            *        Checks that field names are not any capitalization of "descriptor" with any number of prefix or suffix underscores.
 IMPORT_NO_PUBLIC                  MINIMAL, BASIC, STANDARD, SENSIBLE            *        Checks that imports are not public.
-IMPORT_NO_WEAK                    MINIMAL, BASIC, STANDARD, SENSIBLE            *        Checks that imports are not weak.
 PACKAGE_DEFINED                   MINIMAL, BASIC, STANDARD, SENSIBLE            *        Checks that all files have a package defined.
 ENUM_PASCAL_CASE                  BASIC, STANDARD, STYLE_BASIC, STYLE_STANDARD  *        Checks that enums are PascalCase.
 ENUM_VALUE_UPPER_SNAKE_CASE       BASIC, STANDARD, STYLE_BASIC, STYLE_STANDARD  *        Checks that enum values are UPPER_SNAKE_CASE.
@@ -933,7 +930,6 @@ ENUM_VALUE_UPPER_SNAKE_CASE        BASIC, STANDARD           *        Checks tha
 FIELD_LOWER_SNAKE_CASE             BASIC, STANDARD           *        Checks that field names are lower_snake_case.
 FIELD_NOT_REQUIRED                 BASIC, STANDARD           *        Checks that fields are not configured to be required.
 IMPORT_NO_PUBLIC                   BASIC, STANDARD           *        Checks that imports are not public.
-IMPORT_NO_WEAK                     BASIC, STANDARD           *        Checks that imports are not weak.
 IMPORT_USED                        BASIC, STANDARD           *        Checks that imports are used.
 MESSAGE_PASCAL_CASE                BASIC, STANDARD           *        Checks that messages are PascalCase.
 ONEOF_LOWER_SNAKE_CASE             BASIC, STANDARD           *        Checks that oneof names are lower_snake_case.
diff --git a/private/bufpkg/bufcheck/bufcheckserver/bufcheckserver.go b/private/bufpkg/bufcheck/bufcheckserver/bufcheckserver.go
index 2edc57cdc8..9b72652828 100644
--- a/private/bufpkg/bufcheck/bufcheckserver/bufcheckserver.go
+++ b/private/bufpkg/bufcheck/bufcheckserver/bufcheckserver.go
@@ -106,7 +106,6 @@ var (
 			bufcheckserverbuild.LintFieldNoDescriptorRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
 			bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
 			bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
-			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
 			bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
 			bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
 			bufcheckserverbuild.LintPackageDefinedRuleSpecBuilder.Build(true, []string{"MINIMAL", "BASIC", "DEFAULT", "STANDARD", "SENSIBLE"}),
@@ -129,6 +128,7 @@ var (
 			bufcheckserverbuild.LintRPCResponseStandardNameRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
 			bufcheckserverbuild.LintServicePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD", "STYLE_BASIC", "STYLE_DEFAULT", "STYLE_STANDARD"}),
 			bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD", "STYLE_DEFAULT", "STYLE_STANDARD"}),
+			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
 		},
 		Categories: []*check.CategorySpec{
 			bufcheckserverbuild.FileCategorySpec,
@@ -238,7 +238,6 @@ var (
 			bufcheckserverbuild.LintFieldLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
-			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintImportUsedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
@@ -265,6 +264,7 @@ var (
 			bufcheckserverbuild.LintServicePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintSyntaxSpecifiedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
+			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
 		},
 		Categories: []*check.CategorySpec{
 			bufcheckserverbuild.FileCategorySpec,
@@ -367,7 +367,6 @@ var (
 			bufcheckserverbuild.LintFieldNotRequiredRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintFileLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintImportNoPublicRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
-			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintImportUsedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintMessagePascalCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintOneofLowerSnakeCaseRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
@@ -395,6 +394,7 @@ var (
 			bufcheckserverbuild.LintServiceSuffixRuleSpecBuilder.Build(true, []string{"DEFAULT", "STANDARD"}),
 			bufcheckserverbuild.LintStablePackageNoImportUnstableRuleSpecBuilder.Build(false, []string{}),
 			bufcheckserverbuild.LintSyntaxSpecifiedRuleSpecBuilder.Build(true, []string{"BASIC", "DEFAULT", "STANDARD"}),
+			bufcheckserverbuild.LintImportNoWeakRuleSpecBuilder.Build(false, []string{}),
 		},
 		Categories: []*check.CategorySpec{
 			bufcheckserverbuild.FileCategorySpec,
diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverbuild/bufcheckserverbuild.go b/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverbuild/bufcheckserverbuild.go
index ea18f7dcaf..731750d0fd 100644
--- a/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverbuild/bufcheckserverbuild.go
+++ b/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverbuild/bufcheckserverbuild.go
@@ -689,10 +689,15 @@ var (
 	}
 	// LintImportNoWeakRuleSpecBuilder is a rule spec builder.
 	LintImportNoWeakRuleSpecBuilder = &bufcheckserverutil.RuleSpecBuilder{
-		ID:      "IMPORT_NO_WEAK",
-		Purpose: "Checks that imports are not weak.",
-		Type:    check.RuleTypeLint,
-		Handler: bufcheckserverhandle.HandleLintImportNoWeak,
+		ID:         "IMPORT_NO_WEAK",
+		Purpose:    "Checks that imports are not weak.",
+		Deprecated: true,
+		Type:       check.RuleTypeLint,
+		Handler: check.RuleHandlerFunc(
+			func(context.Context, check.ResponseWriter, check.Request) error {
+				return nil
+			},
+		),
 	}
 	// LintImportUsedRuleSpecBuilder is a rule spec builder.
 	LintImportUsedRuleSpecBuilder = &bufcheckserverutil.RuleSpecBuilder{
diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverhandle/lint.go b/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverhandle/lint.go
index 4f08d8af0a..a0686929da 100644
--- a/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverhandle/lint.go
+++ b/private/bufpkg/bufcheck/bufcheckserver/internal/bufcheckserverhandle/lint.go
@@ -460,25 +460,6 @@ func handleLintImportNoPublic(
 	return nil
 }
 
-// HandleLintImportNoWeak is a handle function.
-var HandleLintImportNoWeak = bufcheckserverutil.NewLintFileImportRuleHandler(handleLintImportNoWeak)
-
-func handleLintImportNoWeak(
-	responseWriter bufcheckserverutil.ResponseWriter,
-	_ bufcheckserverutil.Request,
-	fileImport bufprotosource.FileImport,
-) error {
-	if fileImport.IsWeak() {
-		responseWriter.AddProtosourceAnnotation(
-			fileImport.Location(),
-			nil,
-			`Import %q must not be weak.`,
-			fileImport.Import(),
-		)
-	}
-	return nil
-}
-
 // HandleLintImportUsed is a handle function.
 var HandleLintImportUsed = bufcheckserverutil.NewLintFileImportRuleHandler(handleLintImportUsed)
 
diff --git a/private/bufpkg/bufcheck/lint_test.go b/private/bufpkg/bufcheck/lint_test.go
index a80062ef63..9353f37b12 100644
--- a/private/bufpkg/bufcheck/lint_test.go
+++ b/private/bufpkg/bufcheck/lint_test.go
@@ -172,17 +172,6 @@ func TestRunImportNoPublic(t *testing.T) {
 	)
 }
 
-func TestRunImportNoWeak(t *testing.T) {
-	t.Parallel()
-	testLint(
-		t,
-		"import_no_weak",
-		bufanalysistesting.NewFileAnnotation(t, "a.proto", 6, 1, 6, 30, "IMPORT_NO_WEAK"),
-		bufanalysistesting.NewFileAnnotation(t, "a.proto", 7, 1, 7, 29, "IMPORT_NO_WEAK"),
-		bufanalysistesting.NewFileAnnotation(t, "one/one.proto", 6, 1, 6, 30, "IMPORT_NO_WEAK"),
-	)
-}
-
 func TestRunImportUsed(t *testing.T) {
 	t.Parallel()
 	testLint(
diff --git a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/a.proto b/private/bufpkg/bufcheck/testdata/lint/import_no_weak/a.proto
deleted file mode 100644
index ad3daca290..0000000000
--- a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/a.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-syntax = "proto3";
-
-package a;
-
-import "sub/sub1.proto";
-import weak "sub/sub2.proto";
-import weak "one/one.proto";
diff --git a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/buf.yaml b/private/bufpkg/bufcheck/testdata/lint/import_no_weak/buf.yaml
deleted file mode 100644
index 76741b49a9..0000000000
--- a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/buf.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-version: v1
-lint:
-  use:
-    - IMPORT_NO_WEAK
diff --git a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/one/one.proto b/private/bufpkg/bufcheck/testdata/lint/import_no_weak/one/one.proto
deleted file mode 100644
index 81eefe847e..0000000000
--- a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/one/one.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-syntax = "proto3";
-
-package one;
-
-import "sub/sub1.proto";
-import weak "sub/sub2.proto";
diff --git a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub1.proto b/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub1.proto
deleted file mode 100644
index d3ebd1b742..0000000000
--- a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub1.proto
+++ /dev/null
@@ -1,3 +0,0 @@
-syntax = "proto3";
-
-package sub;
diff --git a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub2.proto b/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub2.proto
deleted file mode 100644
index d3ebd1b742..0000000000
--- a/private/bufpkg/bufcheck/testdata/lint/import_no_weak/sub/sub2.proto
+++ /dev/null
@@ -1,3 +0,0 @@
-syntax = "proto3";
-
-package sub;
diff --git a/private/bufpkg/bufimage/bufimageutil/testdata/importmods/regular_weak.txtar b/private/bufpkg/bufimage/bufimageutil/testdata/importmods/regular_weak.txtar
index 044fa62099..88af84ab25 100644
--- a/private/bufpkg/bufimage/bufimageutil/testdata/importmods/regular_weak.txtar
+++ b/private/bufpkg/bufimage/bufimageutil/testdata/importmods/regular_weak.txtar
@@ -1,7 +1,7 @@
 -- a.proto --
 syntax = "proto3";
 import "regular.proto";
-import weak "weak.proto";
+import "weak.proto";
 message ImportRegular {
   Regular x = 1;
 }
diff --git a/private/bufpkg/bufimage/bufimageutil/testdata/importmods/weak_public.txtar b/private/bufpkg/bufimage/bufimageutil/testdata/importmods/weak_public.txtar
index 09433d5512..c3d66a2fd5 100644
--- a/private/bufpkg/bufimage/bufimageutil/testdata/importmods/weak_public.txtar
+++ b/private/bufpkg/bufimage/bufimageutil/testdata/importmods/weak_public.txtar
@@ -1,7 +1,7 @@
 -- a.proto --
 syntax = "proto3";
 import "public.proto";
-import weak "weak.proto";
+import "weak.proto";
 message ImportPublic {
   Public x = 1;
 }
diff --git a/private/gen/proto/go/buf/alpha/audit/v1alpha1/event.pb.go b/private/gen/proto/go/buf/alpha/audit/v1alpha1/event.pb.go
index 94bf8fb5a0..1bc45dff3c 100644
--- a/private/gen/proto/go/buf/alpha/audit/v1alpha1/event.pb.go
+++ b/private/gen/proto/go/buf/alpha/audit/v1alpha1/event.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/audit/v1alpha1/event.proto
 
diff --git a/private/gen/proto/go/buf/alpha/audit/v1alpha1/service.pb.go b/private/gen/proto/go/buf/alpha/audit/v1alpha1/service.pb.go
index 7716a2af77..99d9e5e50b 100644
--- a/private/gen/proto/go/buf/alpha/audit/v1alpha1/service.pb.go
+++ b/private/gen/proto/go/buf/alpha/audit/v1alpha1/service.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/audit/v1alpha1/service.proto
 
diff --git a/private/gen/proto/go/buf/alpha/breaking/v1/config.pb.go b/private/gen/proto/go/buf/alpha/breaking/v1/config.pb.go
index 4353b1ffc2..7f39e4ee92 100644
--- a/private/gen/proto/go/buf/alpha/breaking/v1/config.pb.go
+++ b/private/gen/proto/go/buf/alpha/breaking/v1/config.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/breaking/v1/config.proto
 
diff --git a/private/gen/proto/go/buf/alpha/image/v1/image.pb.go b/private/gen/proto/go/buf/alpha/image/v1/image.pb.go
index 3f118de3d2..ed20c5ac05 100644
--- a/private/gen/proto/go/buf/alpha/image/v1/image.pb.go
+++ b/private/gen/proto/go/buf/alpha/image/v1/image.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/image/v1/image.proto
 
diff --git a/private/gen/proto/go/buf/alpha/lint/v1/config.pb.go b/private/gen/proto/go/buf/alpha/lint/v1/config.pb.go
index 7d9f4bdc70..71d7214f19 100644
--- a/private/gen/proto/go/buf/alpha/lint/v1/config.pb.go
+++ b/private/gen/proto/go/buf/alpha/lint/v1/config.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/lint/v1/config.proto
 
diff --git a/private/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go b/private/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go
index cc38b4bde6..f39c32eafc 100644
--- a/private/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go
+++ b/private/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/module/v1alpha1/module.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/admin.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/admin.pb.go
index 5b90477c53..2e9811c815 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/admin.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/admin.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/admin.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/authn.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/authn.pb.go
index 79c8213ad5..34ad29fa5e 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/authn.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/authn.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/authn.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/authz.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/authz.pb.go
index 8d0c14bddc..971ad629a6 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/authz.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/authz.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/authz.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/convert.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/convert.pb.go
index 14b8b0a2f1..b4e602722a 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/convert.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/convert.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/convert.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/display.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/display.pb.go
index 0cd9718c22..cbb7fb1f77 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/display.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/display.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/display.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/doc.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/doc.pb.go
index 2355fe6251..6c0f47b94b 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/doc.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/doc.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/doc.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go
index a47f89c6ab..ea6375e7b4 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/download.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/git_metadata.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/git_metadata.pb.go
index ecc94ffede..7183ca51ac 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/git_metadata.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/git_metadata.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/git_metadata.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/github.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/github.pb.go
index d36892668b..3b7eab00cf 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/github.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/github.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/github.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/image.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/image.pb.go
index 061c36929f..b8f2daaa82 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/image.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/image.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/image.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/jsonschema.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/jsonschema.pb.go
index cc3f0f839d..b7d1010c4e 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/jsonschema.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/jsonschema.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/jsonschema.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go
index 10d144d2aa..b11b2c2437 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/module.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go
index 2960cb09f8..45eed538c9 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/organization.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/owner.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/owner.pb.go
index 8c3707e450..d6a5c5c8ef 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/owner.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/owner.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/owner.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/plugin_curation.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/plugin_curation.pb.go
index f70d7b1abd..745793e4e6 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/plugin_curation.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/plugin_curation.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/plugin_curation.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go
index 516b5d7593..0cc7639eee 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/push.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/recommendation.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/recommendation.pb.go
index b515658437..09ec12cfb8 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/recommendation.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/recommendation.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/recommendation.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/reference.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/reference.pb.go
index 6705bd6ac6..c494a6b94f 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/reference.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/reference.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/reference.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go
index 89a5b2ef95..f8cedaa9f4 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/repository.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go
index 511f0a4d58..69de1782bf 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/repository_branch.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go
index a739660b41..ab06da0935 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/repository_commit.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go
index 17d7480de4..704854d7c6 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/repository_tag.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go
index 8dfeda5aa8..38134327aa 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/resolve.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/resource.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/resource.pb.go
index 397dfd2237..d92f32ea5b 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/resource.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/resource.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/resource.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/role.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/role.pb.go
index f48ddcfaa7..ada9093dae 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/role.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/role.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/role.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/schema.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/schema.pb.go
index b0f98a79e0..e5682f40ff 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/schema.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/schema.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/schema.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/scim_token.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/scim_token.pb.go
index 21fbf2e351..9de29696c9 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/scim_token.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/scim_token.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/scim_token.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/search.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/search.pb.go
index 0fd69fd84f..f7e8381aae 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/search.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/search.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/search.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio.pb.go
index 25deb4423b..c8b263e0b7 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/studio.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio_request.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio_request.pb.go
index 0f061b8115..9877093e82 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio_request.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/studio_request.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/studio_request.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/token.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/token.pb.go
index 8d49cd8a13..291abc8e11 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/token.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/token.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/token.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go
index f2569bd2e6..cfcaf526c0 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/user.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/verification_status.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/verification_status.pb.go
index 4cdf12b842..1a0dfbf9e0 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/verification_status.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/verification_status.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/verification_status.proto
 
diff --git a/private/gen/proto/go/buf/alpha/registry/v1alpha1/webhook.pb.go b/private/gen/proto/go/buf/alpha/registry/v1alpha1/webhook.pb.go
index 8789c4fb4c..b6a18687fb 100644
--- a/private/gen/proto/go/buf/alpha/registry/v1alpha1/webhook.pb.go
+++ b/private/gen/proto/go/buf/alpha/registry/v1alpha1/webhook.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/registry/v1alpha1/webhook.proto
 
diff --git a/private/gen/proto/go/buf/alpha/studio/v1alpha1/invoke.pb.go b/private/gen/proto/go/buf/alpha/studio/v1alpha1/invoke.pb.go
index ba9cabe300..9a27d00716 100644
--- a/private/gen/proto/go/buf/alpha/studio/v1alpha1/invoke.pb.go
+++ b/private/gen/proto/go/buf/alpha/studio/v1alpha1/invoke.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/studio/v1alpha1/invoke.proto
 
diff --git a/private/gen/proto/go/buf/alpha/webhook/v1alpha1/event.pb.go b/private/gen/proto/go/buf/alpha/webhook/v1alpha1/event.pb.go
index 1bbde8831e..8d0af64401 100644
--- a/private/gen/proto/go/buf/alpha/webhook/v1alpha1/event.pb.go
+++ b/private/gen/proto/go/buf/alpha/webhook/v1alpha1/event.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: buf/alpha/webhook/v1alpha1/event.proto
 
diff --git a/private/gen/proto/go/google/protobuf/cpp_features.pb.go b/private/gen/proto/go/google/protobuf/cpp_features.pb.go
index 405a4bbb8f..59e6cc074c 100644
--- a/private/gen/proto/go/google/protobuf/cpp_features.pb.go
+++ b/private/gen/proto/go/google/protobuf/cpp_features.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: google/protobuf/cpp_features.proto
 
diff --git a/private/gen/proto/go/google/protobuf/java_features.pb.go b/private/gen/proto/go/google/protobuf/java_features.pb.go
index d90894ba09..f2761dab11 100644
--- a/private/gen/proto/go/google/protobuf/java_features.pb.go
+++ b/private/gen/proto/go/google/protobuf/java_features.pb.go
@@ -14,7 +14,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: google/protobuf/java_features.proto
 
diff --git a/private/gen/proto/go/grpc/reflection/v1/reflection.pb.go b/private/gen/proto/go/grpc/reflection/v1/reflection.pb.go
index c4c240e313..e942f4cb15 100644
--- a/private/gen/proto/go/grpc/reflection/v1/reflection.pb.go
+++ b/private/gen/proto/go/grpc/reflection/v1/reflection.pb.go
@@ -21,7 +21,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.4
+// 	protoc-gen-go v1.36.5
 // 	protoc        (unknown)
 // source: grpc/reflection/v1/reflection.proto
 
diff --git a/private/pkg/protogenutil/protogenutil.go b/private/pkg/protogenutil/protogenutil.go
index 3530aae75f..c1b7920dc5 100644
--- a/private/pkg/protogenutil/protogenutil.go
+++ b/private/pkg/protogenutil/protogenutil.go
@@ -442,9 +442,6 @@ func GetFieldGoType(
 	generatedFile *protogen.GeneratedFile,
 	field *protogen.Field,
 ) (string, error) {
-	if field.Desc.IsWeak() {
-		return "struct{}", nil
-	}
 	var goType string
 	pointer := field.Desc.HasPresence()
 	switch field.Desc.Kind() {
@@ -500,9 +497,6 @@ func GetFieldGoZeroValue(
 	generatedFile *protogen.GeneratedFile,
 	field *protogen.Field,
 ) (string, error) {
-	if field.Desc.IsWeak() {
-		return "struct{}", nil
-	}
 	if field.Desc.HasPresence() {
 		return "nil", nil
 	}