Revert "enable storage swapping"

This reverts commit 6d3607a4657dc1bbe27b93dcc4b795c5f4bf7f97.