Work on bug #8061.