More tweaking to try to replicate the travis-ci issues.