I don't think we should mix together both what we support natively and what we can convert here.  If the conversion library is scrubbed from the code everything should still work fine, right now we'd loose the validation if that happens.  I'd just OR the two different sources here.