undo 2 year changes
Merge pull request #2126 from edisonout/unbirthday

Undo 2 year changes