Also removes our toggle for Spigot's option, I doubt anyone uses it.
This will be used by my next commit. But trying to get the build going since CI blew up