PDI-10342 SWT wreaking havoc, removing