Revert "Modified Encoders"

This reverts commit ca399e4699aaccac4560bc77f323dee2a5b08595.