Update #10639

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