2nd attempt to fix Travis builds.