verbose
get rid of unnecessary waits
Revert "get rid of unnecessary waits"

This reverts commit 9550bef732d621421b2821a8c0bdd879849e56b1.