More work on bug #8138.