The previous link worked, but was unnecessary and had a trailing "}".

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5674068