Revert "Fix logic for when to decode or just try to return the value."

This reverts commit caabe83197cd05f87263f5cb400d3fedf910ebf2.
Fix logic for when to decode or just try to return the value.