Revert a51ce113c623e2c126ee0f837abd7ba564b7a8a4 and change match
creation.