5.15.y backporting request

Hi stable folks and happy holidays!

Can you please backport two patches to the 5.15 line by doing:

git cherry-pick fbe618399854 git cherry-pick 2f5b3514c33f

in that order. They apply cleanly ontop of 5.15.11.

The first one is a revert and the second one is the better fix. I would've done the usual cc:stable thing but sending human-typed mail is a lot better - it feels like sending physical letters back in the day. :-)

Thx!