Revert last change related to Travis CI build breaks. I'm not sure that it's needed and it may have made things worse.