Revert "Revert "Image ext again""

This reverts commit 416265601f42750214f156b9817c1ba443aaac1d.