Pull in fix for error exposed by date changes.