Reproduce the build break from Travis, fix the test again.