VID-1455 reverting change for now