Work on bug #7906.