Revert the previous patch and try something else on travis-ci