Revert "Allow erroneous swap warning through."

This reverts commit 30facffd5b46cf04807c5b143e2f8649576725e5.