Work on bug #8400.