Revert Optimal encoding change

@ntalbott @odorcicd while I continue investigating on the side, but I don't want this to hold up our bump to the latest version.