upstream: do not force the cp internal int state