Revert "Merging origin/goliver/master-pending-spidered-preloads into master"

This reverts commit 437029031ac3530ce8417cca42a305db4ca28d91, reversing
changes made to 083f204d82925b3ff38d5fea28526b96e56c802d.
Merging origin/bob/master-pending/revert-spidered-deps into master