Revert "Fix elapsed time check"
This reverts commit cd2f67c39b25de026390bfe2bc1c7aa269f78ccb. In preparation for reverting the calcSpeed rewrite.