Changing to more flexible date

Signed-off-by: Alan Gardner <alan@armoin.com>
Removing bodge

Signed-off-by: Alan Gardner <alan@armoin.com>