Can we just accept both by default?  It seems like it'd be easier to filter out in the code.