VID-1446 Adding in code that should not have been removed