Try to fix Travis-CI builds, part 2