Work on bug #8311.