More work on bug #8030.