Issue #2194583 by David_Rothstein: Added State and country plugins should allow already valid abbreviations to pass through.