Another try to fix travis builds.

@karlnapf - reverting PR to check if changing travis.yml caused the build breaks.