Revert "No more guessing for the date type since schemas updated."

This reverts commit 70f0e5daff748ec2bbf3a4a66f8d83ce9a92ecc6.