More work on bug #8138.  It now correctly uses the form on top of the image to modify it.