Work on bug #8366.