Aaargh.  Please close this as a duplicate of #5940, which I missed when
I was searching to check whether or not I'd already reported this bug.

Sorry for any confusion,

Nalin