VID-566 reverting logic back to the way that VET does it for now