Revert  commit from SW-16 branch