Removed every fix&patch but the required changes for tox_wait_*().