Hopefully resolves persistent Travis build failures