undo changes accidentally included in 09c5add99d50 R=ken2 CC=golang-dev https://golang.org/cl/1736042