Revert "Add the timer value wraparound processing to common wait processing"

This reverts commit cd8f65c94b4b6943116a72b4fb34cdacff3f948c.