Revert "swap"

This reverts commit ed1d1fc3642f9f0d503d4e523d6a48f83201021a.