See discussion on https://go-review.googlesource.com/#/c/22529 We should do this before Go 1.7 since this is otherwise new API we are stuck with.