Updated for Go 1.1.1.