Revert "One last shot at fixing the build..."

This reverts commit 27178036f54764cfb882f43df2934da39055ce0d.
Revert "Updated travis build to (attempt to) fix build"

This reverts commit 630b7613203e23318eef1324051f34b5682f86c7.