build: new build: get rid of 'rebase-apply still exists but mbox given' 2/2