If there is another Go 1.6.x release, consider adding the fix for #16570 (spawned from https://github.com/golang/go/issues/16354#issuecomment-236999228)