Work on bug #8318.