Restore src/Makevars to see if that caused the failure on Travis CI