(this will lead to bad results for anything pre-2.1.2, but the released 2.1.1 in Debian has the same so it’s consistent at least) This reverts commit 0ce249af.