Revert to using OrderedDict.