Try to fix failures in travis

The last commit seems to have broken things there. Only thing looking odd to me
in that commit is this.