Follow-up fix for bug#10027.