Our patch is massive, a subtree would be a better option at this point. Discussed and approved by @code-asher