Revert "attempt to fix travis compilation"

This reverts commit 6e3e8990e8a1b2cbcddf6738c7b63a5cfd0fc4a5.