For https://github.com/tailscale/corp/issues/31133 and https://github.com/golang/go/issues/73522 we want to cherry-pick in https://go-review.googlesource.com/c/go/+/694815