Revert "better wait task"

This reverts commit 42968dcb2fdea7c986ede02e6cf63b1e6cb1e710.