Work on bug #8351.