Follow-up fix for bug#9935.