Hacks to get image-only to work.