The example was fixed; the simplifying rewrite was missed.

R=golang-dev
CC=golang-dev
https://golang.org/cl/5651080