Follow-up for bug#8253.