SPIGOT-3033: Alter behaviour of cancelled hopper transfers (revertedfrom commit 334aa07e2fcadf347afa38196fd3ab09ca4dc3a7)