[master] Resolve issue with unremovable swaps