Revert "Image optimization"

This reverts commit 3484bfbfe782c7fc2414fb7f01bc4a7ff51b8a96.