Work on bug #8436.