Amends bc67033c and e0c3a1c1
No idea why this isn't caught by CI, but it fails for me otherwise.
See also: tokodon!526 (merged)