VID-1810 Redo the janky image handling that existed before