Disabled OrderedSet until possible upstream patches are explored