Follow-up fix for bug#7337.