More work on bug #8296.