Revert topic 'refactor-search-path-construction'

It will be rebased and restored later.
Merge topic 'refactor-search-path-construction' into next

1d3c5956 Revert topic 'refactor-search-path-construction'