De-borking Travis-CI builds, pt. 2