Revert "ref #6581 try to fix exception in MatchStrategyConfigurator"
This reverts commit e807e4380fddd21b2ac521057462a0d03cab298f.
Revert "ref #6581 try to fix exception in MatchStrategyConfigurator"
This reverts commit e807e4380fddd21b2ac521057462a0d03cab298f.