Issue 23261:  Clean-up the hack to store the set.pop() search finger in a hash field instead of the setobject.