Bug 13019 [QA Followup] - Remove use of encode