VID-1820 Don't be so verbose