Revert some of the changes from https://github.com/githedgehog/dataplane/pull/1092, once CI has been fixed. (We've also discussed about changing the way we run VLAB tests in merge queue; but this is beyond the scope of this issue.)
