Another attempt to fix valgrind stall on travis.