Revert "Fix race conditions for self-dependent matchers"

This reverts commit 8a6a530ef90651989347928dce5d37a181236d8a.
Correct fix for race-condition with reentrant matchers