Follow-up fix for bug#9327.