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

* commit 'af7d2e85c72bebea248efd084f7f469206259d39':