VID-1396 Revert unintended change