Attempting to fix Travis, refs T197