revert helper changes that introduced UserSet, it isn't ready