Revert "Fix vpp merge jobs"

No match.