Reorder the unset so that event handlers can do rectify the date if necessary
Merge pull request #421 from stanhu/reorder-change-unset

Reorder the unset so that event handlers can rectify the date if necessary