Fix bug 1025228 - Don't decode URLs again