p/fuel: Rebase, drop upstream clone