Merge "Revert "ART: Fix up some multi-image cases""