CFY-1849 remove es workaround
CFY-1849 remove another es workaround
CFY-1849 extract mutate params to verify things start failing when refresh is false