Convert to a Spigot-esque patch system