VID-1156 putting this back in as it was somehow lost in the shuffle