Handle the older ones separately, so that they still work.