How about giving people with the X passport 60 days or so to get new passports. Bring the reckoning that much closer.
I like that.