Revert "s2w: add s2s only override"

This reverts commit 8f4a4f135ff1839d55af77918baf3b92bfdb18a5.