Travis chutney tests are borked by two bad commits

Seems like Travis chutney tests have been broken for the past 7 days. I did some investigation today using git-bisect and found out that there are two offending commits that both need to be reverted for the tests to pass.

These two commits are 1588767e and 4382e977. Reverting just one of them won't do it and both of them need to be reverted for the tests to pass.

We should fix this so that we start getting a proper CI again.