VID-1524 revert bad replace