re-apply fold_indirect_ref patch