Fixes #15221

Change-Id: I9e927a2f604213338b4572f1a32d0247c58bdc60
Reviewed-on: https://go-review.googlesource.com/21798Reviewed-by: Ian Lance Taylor <iant@golang.org>