Revert "Image updates"

This reverts commit 883d0efd08b9e51bf725a55615283e9abb392cd9.