Fixes golang/go#15449

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