[bug 987172] Fix unicode domain handling

r?