Revert "Fix vpp merge jobs"