More work on bug #8292.