Make the build pass on Travis CI again