Issue #23: remove cut-n-paste weirdo CURRENT_DATECURRENT_TIME