Work on bug #8298.