Use the same pattern of cyclic.Decoders as cyclic.Encoders, otherwise object maps don't match

Change-Id: I80822bf2ce233398cf3a9c07b267ef58f0f6c70a
2 files changed