Backport to Forge 1056, something's not hashing with Forge 1057