Restore date support
3.1.2