Follow-up for bugfix#10079.