I fail at copy/pasting from the main Go repo.

R=adg, remyoudompheng
CC=golang-dev
https://codereview.appspot.com/14960051