BUG: AMI: Fixed target face used as index to source patch. Also undo commit b816fac, which was an incorrect fix for the same bug.