@eht16 well done for tricking me into giving it another shot ;) Though you only got bare minimum resurrection from old work, but that doesn't actually don't look that bad, not sure why I never submitted it.
This wasn't completely intended by me but nice that it worked :). Thanks for pushing the old uncompletely work, if anyone wants to pick it up, now they can.
If nobody stops me, I will merge this in a week so that we finally get a green CI again.