#61968Revert #61943
Description
The ticket has a wrong reference in the commit message text and the target branches seem to be wrong too, because the issue is not present in the versions.
I have to investigate why the original patch was targeted for these versions too, but have been either omitted or fixed.