It's no longer needed for address formatting with 5.89 anyway, as the formatting code expands country codes now.