Revert "Merge matchmaker in engine."

This reverts commit a9fcd2f8d774d1680edcea6f152ffe6e6d094a65.