Revert "Grasping at straws on Travis at this point"

This reverts commit fc19d924ca1bc099023b9a87d78d7759038653b9.
Revert "Spit out a bit more debug info to track down what's up with Travis"

This reverts commit 9af99214e36c09bc0207988eeaff3079f46592c0.