[REVIEW-3-5] [CHERRY-PICKED-3-5] Another partial fix for fdo#45219

[Tor Lillqvist]

I certainly don't know the code in question, but I trust you, so
cherry-picked to -3-5...

--tml