This is why git rebase is a horrible horrible thing.
Made it to compile...