CFY-1849 remove es workaround