Work on bug #8377.