More work on bug #8369.