Expiry date is required in core in so many places. Keeping it that way.