Revert "Giving life to Match Aggregator"

This reverts commit f14bfd61a5b93fa41d06541fcc5c1f589bd6d6a3.
Revert "Revert "Giving life to Match Aggregator""

This reverts commit c2c44dfd71c1056b1482b4cd5e606ed64ea6b9f4.
Reverting revert