Fix bad commit from #8095 and fix bad splitting on :'s in the image

Fixes #8095
Fixes #8658