Fix another issue with the backport of #8889