Revert "cmp without encoding"

This reverts commit 93150993a7ebeb0b46f4c23656867b4edff430c5.