Work on bug #8425.