Revert "[BUGFIX] Prevent wrong ref_index for fields with soft references"