Fixes #15557

Change-Id: I02ad98068894e75d4e08e271fdd16cb420519460
Reviewed-on: https://go-review.googlesource.com/31910Reviewed-by: Andrew Gerrand <adg@golang.org>