Get rid of go 1.0 workarounds.