Revert "[Decode] Oca regression fix"

This reverts commit f39988de.
2 files changed