Revert "better wait task"

This reverts commit 840e1a64d90cbb7ea59604dad925d90155b4cfed.