[PRD-3281] Revert prior changes and replace URLEncoder