Make the decoder interface consistent with gob's
Temporary commit of cluster