This reverts commit 76b11df7f5, as it caused build failures in `diffoscope` and `quark-engine` (and did not build itself.)
76b11df7f5