Copy changes to make the legacy version sensible