The new rule is 5 years after mission completion, so this already allows for a 25-year orbit (as long as you're still operating).