Pick up CL 85476 to fix #23237.

Updates #23237.

Change-Id: I31a48ef39ce90bc1424334762452281ae706d273
Reviewed-on: https://go-review.googlesource.com/85495Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>