VID-1810 Redo the janky image handling that existed before

For this fix I removed all calls to ImageServing which is really difficult to understand, use and change.