Revert "Reworked how the decoder argument works - it's actually required on a few other"

This reverts commit 1ce3b3fc7a468bf42f8284fba523e6a8156eb6ef.
Moved it to a branch.