rolled back deprecated iterator