Revert timing future related hacks