Restore recursive tap search

Fixes #28234.