Revert "Travis ci simplification."

This reverts commit f61d4ba69359028b6cb6d254c8905362b842790e.