Putting back their setTimeout detection logic. Also fixing up our setTimeout call