Revert "P2 of ssw-567 commited"

This reverts commit 00cfc203130282beb2d832d5185c8ec6592a186c.