Revert commit 80dfda8e.

It was causing the unit test for http://www.amazon.com to fail.

I understand the intent of commit 80dfda8e and agree it's addressing a
real issue. But until I understand why it's casuing the unit test to
fail, I'm backing off it for now.