More work on bug #8150.