Revert "Internalise the matching function from the request dependency"

This reverts commit f81529023b5688b5bc48648bacbc4e2ffa5d2feb.