Irreversible decoding: partially revert previous commit, to fix failures in test...