I'm hoping we'll get this supported upstream long before this becomes a headache...