The Travis job times out This reverts commit 5e19ce627a.
5e19ce627a
Sometimes the Travis builds will time out
Luke takes too long