Followup fix for bug#9408.