Wow, I really messed that up. Rebased the wrong way and duplicated every commit. I hope this doesn't break anything.