Reverted two travis test commits as Travis still fails when testing...

This reverts commit e881de4260369b27fd262fcb5119a97d78209b33.