Revert "swapin comps"

This reverts commit e68decb414a0b52f9a13d8b04cbcd9613d021f62.