Followup fix for bug#9456.