…of the branch

CL 403154 merged the branch back into the standard Go branch.

Fixes #51940.

Change-Id: Ibda89792c01630adce7ee3fbd56edbd780fcf79e
Reviewed-on: https://go-review.googlesource.com/c/go/+/403615
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Russ Cox <rsc@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>