Made sure that the original event_timestamp does get perserved