Work on bug #8365.