diff --git a/.golangci.yml b/.golangci.yml
index 2f5cfc6aa..90ce14bf4 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,7 +5,7 @@ linters:
     - durationcheck
     - forcetypeassert
     - gocritic
-    - gomodguard
+    - gomodguard_v2
     - govet
     - ineffassign
     - misspell
@@ -59,9 +59,6 @@ formatters:
   exclusions:
     generated: lax
     paths:
-      # gofumpt v0.11.0 and Go 1.27's gofmt disagree on the indentation of
-      # multiple composite literals returned from a single statement.
-      - internal/ioutil/wait_pipe\.go$
       - third_party$
       - builtin$
       - examples$
diff --git a/internal/ioutil/wait_pipe.go b/internal/ioutil/wait_pipe.go
index d8e3eab68..ce1620929 100644
--- a/internal/ioutil/wait_pipe.go
+++ b/internal/ioutil/wait_pipe.go
@@ -57,11 +57,7 @@ func WaitPipe() (*PipeReader, *PipeWriter) {
 	r, w := io.Pipe()
 	var wg sync.WaitGroup
 	wg.Add(1)
-	return &PipeReader{
-		PipeReader: r,
-		wait:       wg.Wait,
-	}, &PipeWriter{
-		PipeWriter: w,
-		done:       wg.Done,
-	}
+	pr := &PipeReader{PipeReader: r, wait: wg.Wait}
+	pw := &PipeWriter{PipeWriter: w, done: wg.Done}
+	return pr, pw
 }