Revert "Revert "Revert "Match class"""

This reverts commit eb0d61c1112c322f26dc2eeb65c888df62bb2797.