Revert wait() -> closed change