Follow-up fix for bug#5475