Disabling ES since we're running into layer limits