Fixed accidental removal of image fix and removed potentially breaking zoned stuff

[william-lundgren]

This accidentally removes some stuff we want to add.. new PR will come