Remove spigot patches for now