Revert "Fix error in updateMatchComponents"

This reverts commit fa4127f9116541f3c5b8d6dec56365116eb62349.