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

* commit '1aa942760c88925e63c40c2aa2b5aa2c1d37b392':