Remove all references to DecoderSet. Again.

This reverts commit 8c7df3876e84d7bbe76934b51b2b77d5dcc95625.