WIP: trying to avoid travis_wait