Revert "Optimize vswap()"