More work on bug #8062.