Removing drop-in replacementness, just using the encoder