Revert some of the time_elapsed stuff