diff --git a/src/EditPerson.py b/src/EditPerson.py
index 531266b62..6029f8191 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -53,7 +53,6 @@ import ListModel
 import RelLib
 from DateEdit import DateEdit
 from QuestionDialog import QuestionDialog, WarningDialog, ErrorDialog, SaveDialog
-from Calendar import UNDEF
 
 from intl import gettext as _
 
@@ -1287,19 +1286,6 @@ class EditPerson:
             self.pmap[p[0]] = key
 
         self.birth.setDate(self.bdate.get_text())
-	if self.birth.getDateObj().start.year == UNDEF:
-            if self.birth.getDateObj().start.month == UNDEF:
-                if self.birth.getDateObj().start.day == UNDEF:
-                    if self.bdate.get_text():
-                        WarningDialog(_("Unrecognized date"),
-                            _('The text "%s" you have entered into the date '
-                            'field did not match any known date format and will '
-                            'not be recorded.\n\n' 
-                            'If you want to store textual description of this '
-                            'date (such as "during War"), '
-                            'click Edit... button and then '
-                            'use the Note tab instead of the Date field.') 
-                            % self.bdate.get_text() )
         self.birth.setPlace(self.get_place(self.bplace,1))
 
         if not self.person.getBirth().are_equal(self.birth):
@@ -1317,19 +1303,6 @@ class EditPerson:
             family.setChildList(new_order)
     
         self.death.setDate(self.ddate.get_text())
-	if self.death.getDateObj().start.year == UNDEF:
-            if self.death.getDateObj().start.month == UNDEF:
-                if self.death.getDateObj().start.day == UNDEF:
-                    if self.ddate.get_text():
-                        WarningDialog(_("Unrecognized date"),
-                            _('The text "%s" you have entered into the date '
-                            'field did not match any known date format and will '
-                            'not be recorded.\n\n' 
-                            'If you want to store textual description of this '
-                            'date (such as "during War"), '
-                            'click Edit... button and then '
-                            'use the Note tab instead of the Date field.') 
-                            % self.ddate.get_text() )
         self.death.setPlace(self.get_place(self.dplace,1))
 
         if not self.person.getDeath().are_equal(self.death):
diff --git a/src/EventEdit.py b/src/EventEdit.py
index ca3ecabd4..27d1de288 100644
--- a/src/EventEdit.py
+++ b/src/EventEdit.py
@@ -204,18 +204,6 @@ class EventEditor:
 
         ename = self.name_field.get_text()
         self.date.set(self.date_field.get_text())
-        if self.date.start.year == Calendar.UNDEF:
-            if self.date.start.month == Calendar.UNDEF:
-                if self.date.start.day == Calendar.UNDEF:
-                    if self.date_field.get_text():
-                        WarningDialog(_("Unrecognized date"),
-                            _('The text "%s" you have entered into the date '
-                            'field did not match any known date format and will '
-                            'not be recorded.\n\n' 
-                            'If you want to store textual description of this '
-                            'date (such as "during War"), '
-                            'use the Note tab instead of the Date field.') 
-                            % self.date_field.get_text() )
         ecause = self.cause_field.get_text()
         eplace_obj = self.get_place(self.place_field,1)
         buf = self.note_field.get_buffer()