SWC-697 rollback