connection: Go back to the pre-27c3a4 way of writing the [Locale.]Charset lookup