remove usage of Go 1.1 API to support older clients