More work on bug #7369.