Removed the decode call, and encode we were adding. It was causing more problems than it solved. I did some testing. The removal doesn't seem to have broken anything.