More work on bug #8378.