More work on bug #8138.  Base functionality on images now works.