This previous block of code seems unrelated to the `DateTimeOffset` change. Should this be in another PR?