Updates #4943

Change-Id: I082b97ccd787cf91245d39b8d93783732db6f42c
Reviewed-on: https://go-review.googlesource.com/6171Reviewed-by: Nigel Tao <nigeltao@golang.org>