Work on bug #8296.