Merge "Revert "Use std::set instead of SortedVector""