Use CGI instead of URI in params processing

(Looks like this got flipped back during a merge before)