Avoid wait_until

Addresses pull request feedback