am c9daed7a: Don\'t do chip resolving in place

* commit 'c9daed7a40dbbae4b5fd5b60f32cdca9253644aa':
  Don't do chip resolving in place