Fixes #12391.

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