Revert "Attempt to support spigot protocol hack"

This reverts commit e36675d21a99ea2b34bdad7a57e2b0de8203df0e.