Revert "The travis defaults should work"

This reverts commit a348adaa71c49f41698f1ca153ff6d2debe2c2e1.