Revert fix HW decode issue