Revert "Ryccardo's storage swap removal"

This reverts commit 7745ee5104ab65991973ad446819ca10ffc33667.