Reverted std::set build for uint_set
Merge reversion