Fix travis-specific infinite loop in 3.0

Not ready for merge yet; I'm using this PR as a test-runner.