[master][v3] Resolve issue with unremovable swaps