Reverted 9676bf3 from PR #839 thanks to the addition of PartialDatetime.