Revert website finder changes
Merge pull request #490 from G5/revert-website-finder-fix

Revert website finder changes