Revert "Travis fix attempt #2"

This reverts commit bd041ce8089446e920378bde2db7fcf49fb84836.