Revert "Attempting travis fix"

This reverts commit e83724769ca8299b572f99320c67d9397948ba97.
Attempting travis fix, take 2