VID-1148 Make sure changed logic is in BOTH places it should be