Proto: fix storage error during transfer

Boubacar Sallrequested to merge
nomadic-labs/tezos:bsall@bugfix-storage-error-during-transfer-2 into master

This MR re-introduces !3913, which was reverted by !3939 (merged).

Merge request reports