VID-255 Add back logic change that was refactored out