Revert "fixed swaps"

This reverts commit 57f996cbc361db8aa32e54bf4da654e51ff6ff99.