Follow-up to bugfix #58664