Fix DateStrings
Revert "Fix DateStrings"

This reverts commit b79017952fb9c1e6981d14c2b150d41aaf0620c6.
Merge commit '5292f6b95a6579b341d22bfa3dce1527a8e8d21d'