Created by: cvrebert
See https://github.com/travis-ci/travis-ci/issues/5092 for more details. Reverts #18376.