Revert "regression since fdo#70553"

This reverts commit 12546c8511f0cc8eec0ca7e8cb86ff00dfd429e6.

Apparently I stirred a hornet's nest with this. And I have already
wasted enough time arguing...