Also removes our toggle for Spigot's option, I doubt anyone uses it.
Remove two features added upstream