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

* commit '810cc386944c3e90bc4e4f8328ec9cf8187803c7':