Yeah, I know, I should split this...

...but my attempts to do so have borked, and we need to get this into the repo ASAP.