Revert "better wait task"

This reverts commit 3f1e9b1882878b980c43cdaaa0a0892a7106e32c.