extra: revert part of the recurse patch which broke smatch_equiv