Reverting the use of spigot repo