Revert "Moved Date extension"

This reverts commit 85c195d89922d160d0157aa6e0db72402d63e55d.