Revert "better wait task"

This reverts commit 36a134b4088912cc70d0f4651a7ed3da8df2b3b8.