Make Travis happy (attempt #2)
Revert "Try to figure out what's wrong with Travis"

This reverts commit 504b1feabf6651db68abb8cb46d842008b130799.