[Finder][Iterator] Revert all ->current() fix