Add decoding
Revert "Add decoding"

This reverts commit c38a832ab2995890b6620c7a32445d25b7074cc8.
Revert "Revert "Add decoding""

This reverts commit 71eb7a2f53fef268244d1946dfb727faccb7544e.