Pretty sure urllib.quote is doing the right thing so put it back.