Fix faulty rebase, whoops