More work fixing travis-ci/travis-ci#2220