Post #2325569

@ami@floss.social I think I'd have to split this into 2 PRs and then need to fortify the tests. That's probably trivial for somebody else, but I'm exhausted.