Revert "Merge branch 'travis'"

This reverts commit fa2bd7df742087c97285523e4f236b3e34cba860, reversing
changes made to 51b18a5377139fdae1a616cd1a7b017acb94957a.