Trying to fix Travis. See commit for details.