Finish phasing out match_original