Comically, this is a giant yak shave to avoid having to manually look up the 6 commits that snuck in via rebase and not squash, and broke my

--oneline

output.