More work on bug #7494.