Revert 7737dd6..45cbc06

This rolls back to commit 7737dd6d1fa68460a30fbb5611bbf112ba8d40b7.
Fixed issues with date format