Work on bug #7494.