Fix for #8827 was incomplete

### Description

The fix for #8827 was incomplete. I'm opening this issue because we can't reuse the original one.

The regression was introduced in the following versions:

- 8.0.20
- 8.1.7

It was fixed in 8.0.21, but the fix in 8.1.8 was incomplete.

### PHP Version

&gt;= 8.1.7

### Operating System

_No response_