Revert "Revert accidential storage swap"

This reverts commit 8140d98ea33680e79bec2a7e94d79999efeaaf6f.