Hack go/types to behave as previously