Revert "s2w: add s2s only override"

This reverts commit 9fa54003f83fa53dcb24b1afda13ea6909677c90.