Fixes #242. Change-Id: Idbb9853e3ffd51aaad6a022a8a736408273e3549 Reviewed-on: https://go-review.googlesource.com/52610 Reviewed-by: Andrew Bonventre <andybons@golang.org>