First attempt at integrating aadnk's spigot workaround.