Switch to using OrderedDict from astropy.utils