Alternative to 3d6651ab which caused issues.

Fixes https://bugs.archlinux.org/task/70580 .