This is a fix-up for eef85c4a which broke this. Tracked down by @w-simon Fixes: #14453 (cherry picked from commit 65f6b6bd)
mentioned in commit 3b803a5e