Should fix travis build, 2nd try

This is really ugly, need to find a better way.