Backport partially https://disenchant.net/git/tyrquake.git/commit/?id=7edb2138d11d44c1d2e10fefef8f3577a6e2891f