For Travis CI - revert the changes as the fix does not work.
See https://github.com/travis-ci/travis-ci/issues/2031#issuecomment-42103579.