Work on bug #8138.