Fix travis breakage

Fixes #6722.