WIP: travis_wait is back