Add untested compatibility with Spigot.