Revert Optimal encoding change
Merge pull request #1318 from Shopify/revert_optimal_encoding

Revert Optimal encoding change