Revert "Merge remote-tracking branch 'origin/Match_Info'"

This reverts commit c3538a8a414e4a29fb75789db61dfcd43f87ebc2, reversing
changes made to 71f250a787bcb0b6f08003e2d66dc2f6415cd605.