I can add that...
Adding it to the `wait_for_*` methods seems like a bad idea