Revert "fix message decoding"

This reverts commit 378bfbdbe015c8a4d71c49f5b3400f6966c28b61.