Revert "Remove all references to DecoderSet."

This reverts commit b14e9730520ef54e9c043944b2d33434434da5bb.