Work on bug #8344.