Should fix travis build, 3rd try

The more commits I make the fix this, the uglier the solution seems.