Spigot #633 compatibility for the snapshot workaround.