For local we've stuck to having encoded uris to avoid issues, thus they should always be bytestrings and not unicode. So this was intended to stick with that. So should I still change this?