cherry pick server time check from 8.5 branch

pulling this code from 8.5 branch
Is there ever a time when we don't want this behavior?  If not, then why is this a config option?