Try to get integration builds to be happy again