To answer the question: it appears the solution is to rerun the expired_retention_period scheduled task. This appears to reset all of the expirations to the correct value.
Security and privacy
Remove / Reset data from "Date deletion" list
This discussion has been locked so you can no longer reply to it.