Mitigates GH-373 Technically a workaround rather than a true fix
Also removes our toggle for Spigot's option, I doubt anyone uses it.