Revert changes related to datetime