Revert some change that cause dead lock.
Update travis.yml