VID-1669 reverting a hacky attempt