Revert workaround for Travis CI https://github.com/travis-ci/travis-ci/issues/2841.