Work on bug #8143.