Revert "Encoding fix on cbs"

This reverts commit d582e7a64b0ba1df623cb20dbd3e721e6ecc9ac7.