Revert 8fce0c7..5b414fd

This rolls back to commit 8fce0c7aea63308760fdc923ed05f2141607057c.
Reverting back to normal image delivery