Revert most of the recent travis build changes