SortedDict is deprecated in master, can we make it use OrderedDict instead?