Revert "Improvements to naive scraper"

This reverts commit bafe89890a1418fce56e8898201d7c1283c32c23.

Several issues; not properly getting urls without protocol, not following redirects properly with naive scraper.

Change-Id: I65d1e9e1b1795d86bc9a736768f7b60979915141