Revert "s4"

This reverts commit 82f69fe0bb41c7e209815eb0364afa4f90597bb5.