Revert "Merges encoding branch (#1187)"

This reverts commit a1ed8fc6f6d779a0e1610d43186811732d196c1c.
8 files changed