Revert "More Travis tweaks."

This reverts commit 3f3de4d8071df3857db5dc829e83bd13b0ce329b.