Revert "Merge pull request #132 from vinniefranco/multi-encode-issue-113"

This reverts commit 740d52cb346bfd7c755511443728ef482a272d3b, reversing
changes made to a523fe904e60e73e3e21ad6374311586419c2216.