unescape URI before escaping.

If we already have %-encoded characters in the URI, we want
to preserve them.