Keep the source distribution fix *and* fix actually building the package
Fix Travis build