Work on bug #8292.