Fix locale negotiation w/o aliases

Consider this PR instead of #455 as it can be automatically merged to canary branch. Sorry for the inconvenience.