Revert "TravisCI cleanup."

This reverts commit 69750b249c77b56e09fa15df6a84fa9cee1b6b77.