More work on bug #8365.